summaryrefslogtreecommitdiff
path: root/hw/xquartz/quartzKeyboard.c
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-11-21 10:53:39 -0800
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-11-21 10:59:26 -0800
commitb262788401715787c68cea4ca79f4b270307afee (patch)
treeaf0511211eba31c3a65beb4579afbc87c7d2fef5 /hw/xquartz/quartzKeyboard.c
parent510744444329170f702d31d43997a6bbc1591b44 (diff)
XQuartz: More Tiger ifdefs
(cherry picked from commit 803509072f2c039e5cd555c4ac14d672f0e698c5)
Diffstat (limited to 'hw/xquartz/quartzKeyboard.c')
-rw-r--r--hw/xquartz/quartzKeyboard.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 2eb5feeca..9aa9ece5a 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -753,6 +753,11 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
}
#endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+ if(currentKeyLayoutRef)
+ CFRelease(currentKeyLayoutRef);
+#endif
+
if (chr_data == NULL) {
ErrorF ( "Couldn't get uchr or kchr resource\n");
return FALSE;
@@ -856,7 +861,6 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
k[0] = known_numeric_keys[i].keypad;
}
}
- if(currentKeyLayoutRef) CFRelease(currentKeyLayoutRef);
-
+
return TRUE;
}