From 2762cafc321166ac48f80146720709b1011e6894 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Thu, 27 Nov 2008 13:35:42 +1100
Subject: [PATCH] XkbCopyKeymap: inputInfo.keyboard is not a special case

The device-walking code is still depressing, though.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 xkb/xkbUtils.c | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index aeb9892ba..19be1cfb0 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -2148,26 +2148,19 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
     if (!_XkbCopyGeom(src, dst))
         return FALSE;
 
-    if (inputInfo.keyboard->key->xkbInfo &&
-        inputInfo.keyboard->key->xkbInfo->desc == dst) {
-        pDev = inputInfo.keyboard;
-    }
-    else {
-        for (tmpDev = inputInfo.devices; tmpDev && !pDev;
-             tmpDev = tmpDev->next) {
-            if (tmpDev->key && tmpDev->key->xkbInfo &&
-                tmpDev->key->xkbInfo->desc == dst) {
-                pDev = tmpDev;
-                break;
-            }
+    for (tmpDev = inputInfo.devices; tmpDev && !pDev; tmpDev = tmpDev->next) {
+        if (tmpDev->key && tmpDev->key->xkbInfo &&
+            tmpDev->key->xkbInfo->desc == dst) {
+            pDev = tmpDev;
+            break;
         }
-        for (tmpDev = inputInfo.off_devices; tmpDev && !pDev;
-                tmpDev = tmpDev->next) {
-            if (tmpDev->key && tmpDev->key->xkbInfo &&
-                    tmpDev->key->xkbInfo->desc == dst) {
-                pDev = tmpDev;
-                break;
-            }
+    }
+    for (tmpDev = inputInfo.off_devices; tmpDev && !pDev;
+         tmpDev = tmpDev->next) {
+        if (tmpDev->key && tmpDev->key->xkbInfo &&
+            tmpDev->key->xkbInfo->desc == dst) {
+            pDev = tmpDev;
+            break;
         }
     }