xserver: Branch 'master'

[Peter Hutterer]

 xkb/xkb.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 245d1c162c7b13c98a9a28dc7ad441366d7e8006
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Fri Oct 31 11:50:47 2008 +1030

    xkb: ProcXkbSetCompatMap should do dry-runs, then normal runs.
    
    Was doing only dry-runs, which kinda explains why changing the compat map
    didn't really have any effect.
    Fallout from e8c2a3d7c996cb41c4c44ba67acae5ff9438fc06.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>

diff --git a/xkb/xkb.c b/xkb/xkb.c
index b4a8ed3..d588f56 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -2906,7 +2906,7 @@ ProcXkbSetCompatMap(ClientPtr client)
     }
 
     /* Yay, the dry-runs succeed. Let's apply */
-    rc = _XkbSetCompatMap(client, dev, stuff, data, TRUE);
+    rc = _XkbSetCompatMap(client, dev, stuff, data, FALSE);
     if (rc != Success)
         return rc;
     if (stuff->deviceSpec == XkbUseCoreKbd)
@@ -2919,7 +2919,7 @@ ProcXkbSetCompatMap(ClientPtr client)
                 rc = XaceHook(XACE_DEVICE_ACCESS, client, other, DixManageAccess);
                 if (rc == Success)
                 {
-                    rc = _XkbSetCompatMap(client, other, stuff, data, TRUE);
+                    rc = _XkbSetCompatMap(client, other, stuff, data, FALSE);
                     if (rc != Success)
                         return rc;
                 }