xserver: Branch 'master'

[Tiago Vignatti]

 hw/kdrive/src/kinput.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

New commits:
diff-tree 1340f34ec98c41781164018d43bd7bb858d8132b (from 9725516b4274ceaf9d6caf372c5439b4c9db2316)
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date:   Wed Jun 27 03:04:55 2007 -0300

    Fix kdrive XKB.

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 7edcc51..7b22d17 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -740,6 +740,9 @@ KdKeyboardProc(DeviceIntPtr pDevice, int
     DevicePtr   pDev = (DevicePtr)pDevice;
     KdKeyboardInfo *ki;
     Atom xiclass;
+#ifdef XKB
+    XkbComponentNamesRec names;
+#endif
 
     if (!pDev)
 	return BadImplementation;
@@ -788,11 +791,9 @@ KdKeyboardProc(DeviceIntPtr pDevice, int
         KdInitModMap(ki);
         KdInitAutoRepeats(ki);
 
-#ifndef XKB
+#ifdef XKB
         if (!noXkbExtension) {
             memset(&names, 0, sizeof(XkbComponentNamesRec));
-            if (XkbInitialMap) 
-                names.keymap = XkbInitialMap;
 
             XkbSetRulesDflts ("base", "pc105", "us", NULL, NULL);
             ret = XkbInitKeyboardDeviceStruct (pDevice,