summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-02-07 21:22:50 +1030
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-02-07 21:24:45 +1030
commit9d5edebe9664f4ac35b82830e000a72d5ca9cbe4 (patch)
treea641798d032d00808fe26f80d2060afa0c1c4925
parent96eafa3d4f05997dac8be6a8d66a92410511824c (diff)
Xi: finish XKB initialisation before copying the keymap.
-rw-r--r--Xi/exevents.c3
1 files changed, 3 insertions, 0 deletions
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");
}