summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-10-31 11:50:47 +1030
committerPeter Hutterer <peter.hutterer@redhat.com>2008-10-31 16:00:48 +1030
commit245d1c162c7b13c98a9a28dc7ad441366d7e8006 (patch)
treecd204d8916dda66d1d4253b7593d035c81693b02
parent70e18a3b6b9d52169bca650f6cd4ef5d8ab40d95 (diff)
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@redhat.com>
-rw-r--r--xkb/xkb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xkb/xkb.c b/xkb/xkb.c
index b4a8ed3a3..d588f562a 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;
}