XQuartz: Fix an uninitialized keyboard_type on Tiger

This commit is contained in:
Jeremy Huddleston 2008-11-25 20:14:37 -08:00
parent d2e0624dd3
commit 27b1a5eb34

View File

@ -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);