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

[Jeremy Huddleston]

 hw/xquartz/X11Controller.m |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 81187364e512606a6aebb95ab2967d9d420f57f2
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Aug 20 09:50:54 2008 -0700

    XQuartz: Support windowItemModMask=0 or -1 to disable window shortcuts.

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 682a692..19a4d2b 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -139,7 +139,10 @@
 		
       name = [[list objectAtIndex:i] objectAtIndex:0];
       shortcut = [[list objectAtIndex:i] objectAtIndex:1];
-		
+        
+      if(windowItemModMask == 0 || windowItemModMask == -1)
+          shortcut = @"";
+
       item = (NSMenuItem *) [menu addItemWithTitle:name action:@selector
 				  (item_selected:) keyEquivalent:shortcut];