xserver: Branch 'master'

[Peter Hutterer]

 dix/devices.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0cfd48130842685828e0662a27272a3a65facd23
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Mar 23 11:41:16 2009 +1000

    dix: Dont change the keyboard mapping on non-keyboard devices.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/devices.c b/dix/devices.c
index 065b202..4a36669 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)