xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 hw/xquartz/quartzKeyboard.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 27b1a5eb3482052253ebdce1a09aedf05ac1b099
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Nov 25 20:14:37 2008 -0800

    XQuartz: Fix an uninitialized keyboard_type on Tiger

diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 8ac05dd..4ec38d8 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -571,7 +571,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
 #endif
     const void *chr_data = NULL;
     int num_keycodes = NUM_KEYCODES;
-    UInt32 keyboard_type = 0;
+    UInt32 keyboard_type = LMGetKbdType();
     int i, j;
     OSStatus err;
     KeySym *k;
@@ -579,7 +579,6 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
     TISInputSourceRef currentKeyLayoutRef = TISCopyCurrentKeyboardLayoutInputSource();
-    keyboard_type = LMGetKbdType();
 
     if (currentKeyLayoutRef) {
       currentKeyLayoutDataRef = (CFDataRef )TISGetInputSourceProperty(currentKeyLayoutRef, kTISPropertyUnicodeKeyLayoutData);