From a309c936bb79e2fea04a96ce33c7da99ed902484 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon, 5 Feb 2007 11:38:44 +1030
Subject: [PATCH] xkb:	Daniel's patch to stop evdev keyboard segfaults.

mi:	Remove quickfix from ba547d4f6a2707f51f0d826389d2d418fb62367a
---
 mi/mieq.c      | 8 --------
 xkb/xkbUtils.c | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/mi/mieq.c b/mi/mieq.c
index 478b61ef0..6ed5ef357 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -244,14 +244,6 @@ mieqProcessInputEvents()
                 dev = e->pDev;
             }
 
-            /* FIXME: Keyboard extension devices do not have devPrivates
-             * initialized, resulting in a segfault in XkbHandleActions. */
-            if (e->event[0].u.u.type == DeviceKeyPress || 
-                    e->event[0].u.u.type == DeviceKeyRelease ||
-                    e->event[0].u.u.type == KeyPress ||
-                    e->event[0].u.u.type == KeyRelease)
-                e->pDev = dev = inputInfo.keyboard;
-
             /* MPX devices send both core and Xi events. 
              * Use dev to get the correct processing function but supply
              *  e->pDev to pass the correct device 
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 400306a22..e24c1f0b4 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -1220,7 +1220,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
                     tmp = xalloc(src->max_key_code + 1);
                 if (!tmp)
                     return FALSE;
-                dst->map->syms = tmp;
+                /*dst->map->syms = tmp;*/
+                dst->map->modmap = tmp;
             }
             memcpy(dst->map->modmap, src->map->modmap, src->max_key_code + 1);
         }