xserver: Branch 'xorg-server-1.5-apple' - 2 commits

[Jeremy Huddleston]

 hw/xquartz/X11Application.m                                   |   29 +++++-----
 hw/xquartz/bundle/Resources/English.lproj/Localizable.strings |binary
 hw/xquartz/pbproxy/pbproxy.h                                  |    1 
 3 files changed, 16 insertions(+), 14 deletions(-)

New commits:
commit 733cb50011b94d23090afad50a514f2d30d08b72
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Thu Oct 23 17:32:32 2008 -0700

    XQuartz: Do check_xinitrc() later to avoid possible deadlock.
    (cherry picked from commit af95174a088dc787d124ec548b1005f5b67c9e8d)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index d87549f..2acd742 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -788,20 +788,19 @@ static void check_xinitrc (void) {
 Windows displayed by X11 applications may not have titlebars, or may look \
 different to windows displayed by native applications.\n\n\
 Would you like to move aside the existing file and use the standard X11 \
-environment?", @"Startup xinitrc dialog");
-	
-    if (NSRunAlertPanel (nil, msg, NSLocalizedString (@"Yes", @""),
-			 NSLocalizedString (@"No", @""), nil)
-	== NSAlertDefaultReturn) {
-      char buf2[1024];
-      int i = -1;
-      
-      snprintf (buf2, sizeof (buf2), "%s.old", buf);
+environment the next time you start X11?", @"Startup xinitrc dialog");
+
+    if(NSAlertDefaultReturn == NSRunAlertPanel (nil, msg, NSLocalizedString (@"Yes", @""),
+                                                NSLocalizedString (@"No", @""), nil)) {
+        char buf2[1024];
+        int i = -1;
       
-      for (i = 1; access (buf2, F_OK) == 0; i++)
-	snprintf (buf2, sizeof (buf2), "%s.old.%d", buf, i);
+        snprintf (buf2, sizeof (buf2), "%s.old", buf);
       
-      rename (buf, buf2);
+        for(i = 1; access (buf2, F_OK) == 0; i++)
+            snprintf (buf2, sizeof (buf2), "%s.old.%d", buf, i);
+
+        rename (buf, buf2);
     }
     
  done:
@@ -824,7 +823,6 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
     [[NSNotificationCenter defaultCenter] addObserver:NSApp
 					selector:@selector (became_key:)
 					name:NSWindowDidBecomeKeyNotification object:nil];
-    check_xinitrc ();
 
     /*
      * The xpr Quartz mode is statically linked into this server.
@@ -850,6 +848,11 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
 
     /* Tell the server thread that it can proceed */
     QuartzInitServer(argc, argv, envp);
+    
+    /* This must be done after QuartzInitServer because it can result in
+     * an mieqEnqueue() - <rdar://problem/6300249>
+     */
+    check_xinitrc();
            
     [NSApp run];
     /* not reached */
diff --git a/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings
index fec942e..001227a 100644
Binary files a/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings and b/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings differ
commit 882ae87740a8a8ab12c7cda6cb71b8171d7e8df9
Author: George Peter Staplin <gps at Georges-Workstation.local>
Date:   Thu Oct 23 17:56:46 2008 -0600

    XQuartz: pbproxy: pbproxy.h had invalid macro usage with 2 #else statements, so it wasn't building.  Fix the build.
    (cherry picked from commit 6bcbb9ba85d95d7df63811a482abc39c4d595366)

diff --git a/hw/xquartz/pbproxy/pbproxy.h b/hw/xquartz/pbproxy/pbproxy.h
index 324d56c..60566a6 100644
--- a/hw/xquartz/pbproxy/pbproxy.h
+++ b/hw/xquartz/pbproxy/pbproxy.h
@@ -37,7 +37,6 @@ extern void x_input_run (void);
 # define DB(msg, args...) debug_printf("%s:%s:%d " msg, __FILE__, __FUNCTION__, __LINE__, ##args)
 #else
 # define DB(msg, args...) do {} while (0)
-#else
 #endif
 
 #define TRACE() DB("TRACE\n")