xserver: Branch 'master' - 2 commits

[Jeremy Huddleston]

 hw/xquartz/X11Application.m |    2 +-
 hw/xquartz/quartzKeyboard.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2db1afbf2e56d8743c701d81a5797001ce9e5c52
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Aug 26 23:09:20 2008 -0700

    XQuartz: Always use TIS for the keyboard layout seed since KB* aren't thread safe.
    (cherry picked from commit c8244177b0dbcb28d2f5509e6f2a3e8057889790)

diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index aebc941..d26fbd3 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -1103,7 +1103,8 @@ Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
 /* TODO: Not thread safe */
 unsigned int QuartzSystemKeymapSeed(void) {
     static unsigned int seed = 0;
-#if defined(__x86_64__) || defined(__ppc64__)
+//#if defined(__x86_64__) || defined(__ppc64__)
+#if 1
     static TISInputSourceRef last_key_layout = NULL;
     TISInputSourceRef key_layout;
 
commit 319405fa4a530804c19fb7d0fcece5c912e41c9d
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Aug 26 21:11:35 2008 -0700

    XQuartz: Fixed needed xplugin version. ><
    (cherry picked from commit 01b3a99dff79e0d2b316e02658c19fa79d9144ae)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 707a67f..5b1d171 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -245,7 +245,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
                         DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
 #endif
                     } else if(X11EnableKeyEquivalents &&
-#if XPLUGIN_VERSION >= 4
+#if XPLUGIN_VERSION >= 1
                               xp_is_symbolic_hotkey_event([e eventRef])) {
 #else
                               [[self mainMenu] performKeyEquivalent:e]) {