From 25eccf12c89d73b8bce2c9be14841efb230acedc Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri, 29 Aug 2008 03:54:55 -0700
Subject: [PATCH] XQuartz: xp_is_symbolic_hotkey_event catches the input menu,
 but not our mainMenu, so we still need to do that the old way.

---
 hw/xquartz/X11Application.m | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 4005c7579..9ec95de54 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -243,13 +243,15 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
                         for_x = NO;
                         DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
 #endif
-                    } else if(X11EnableKeyEquivalents &&
 #if XPLUGIN_VERSION >= 1
+                    } else if(X11EnableKeyEquivalents &&
                               xp_is_symbolic_hotkey_event([e eventRef])) {
-#else
+                        swallow_up = [e keyCode];
+                        for_x = NO;
+#endif
+                    } else if(X11EnableKeyEquivalents &&
                               [[self mainMenu] performKeyEquivalent:e]) {
                         for_appkit = NO;
-#endif
                         swallow_up = [e keyCode];
                         for_x = NO;
                     } else {