From 9d5edebe9664f4ac35b82830e000a72d5ca9cbe4 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu, 7 Feb 2008 21:22:50 +1030
Subject: [PATCH] Xi: finish XKB initialisation before copying the keymap.

---
 Xi/exevents.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index faf391fc3..46ee66d74 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -184,7 +184,10 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
 #ifdef XKB
         if (!noXkbExtension && dk->xkbInfo && dk->xkbInfo->desc) {
             if (!mk->xkbInfo || !mk->xkbInfo->desc)
+            {
                 XkbInitDevice(master);
+                XkbFinishDeviceInit(master);
+            }
             if (!XkbCopyKeymap(dk->xkbInfo->desc, mk->xkbInfo->desc, True))
                 FatalError("Couldn't pivot keymap from device to core!\n");
         }