summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-03-23 11:41:16 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-04-07 19:25:17 +1000
commit0cfd48130842685828e0662a27272a3a65facd23 (patch)
tree50f8ec28886702e383107bc97fb735de6185540a
parent69e73e5ce0e3971eceed71216d2d7e7d9cd57cc2 (diff)
dix: Dont change the keyboard mapping on non-keyboard devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--dix/devices.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/dix/devices.c b/dix/devices.c
index 065b20237..4a36669ac 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1505,6 +1505,8 @@ ProcChangeKeyboardMapping(ClientPtr client)
for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {
if (tmp->isMaster || tmp->u.master != pDev)
continue;
+ if (!tmp->key)
+ continue;
rc = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess);
if (rc != Success)