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

[Jeremy Huddleston]

 hw/darwin/apple/bundle-main.c     |   13 +------------
 hw/darwin/quartz/X11Application.m |    3 ---
 2 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit bf1f49c5304db6c4bfcfc83f9d47944f48024f82
Author: Ben Byer <bbyer at bbyer.local>
Date:   Fri Nov 30 11:18:46 2007 -0800

    properly implemented xcb check for stale sockets
    (cherry picked from commit f543cb8fbb3d9213cb03396f4252ab9821319993)

diff --git a/hw/darwin/apple/bundle-main.c b/hw/darwin/apple/bundle-main.c
index 34cbcba..d46e7b2 100644
--- a/hw/darwin/apple/bundle-main.c
+++ b/hw/darwin/apple/bundle-main.c
@@ -614,20 +614,9 @@ display_exists_p (int number)
     if (access (buf, F_OK) != 0)
 		return FALSE;
 	
-    /* This is a private function that we shouldn't really be calling,
-	 but it's the best way to see if the server exists (without
-	 needing to hold the necessary authentication to use it) */
-	
     sprintf (buf, ":%d", number);
-    /*    conn = _X11TransConnectDisplay (buf, &fullname, &idisplay, &iscreen,
-									&conn_auth_name, &conn_auth_namelen,
-									&conn_auth_data, &conn_auth_datalen); */
-    conn = xcb_connect(buf, NULL);
-
-    if (conn == NULL)
-		return FALSE;
+    if (xcb_connection_has_error(conn)) return FALSE;
 	
-    //    _XDisconnectDisplay (conn);
     xcb_disconnect(conn);
     return TRUE;
 }
commit be05ef82d5d598025d193f1732947f6f29502a65
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Fri Nov 30 16:09:23 2007 -0800

    Darwin: Undo focus-hack which didn't work right.
    (cherry picked from commit f54b28eeba119c42d0fcccfbe295306dd670221a)

diff --git a/hw/darwin/quartz/X11Application.m b/hw/darwin/quartz/X11Application.m
index 514bc49..aef0699 100644
--- a/hw/darwin/quartz/X11Application.m
+++ b/hw/darwin/quartz/X11Application.m
@@ -313,9 +313,6 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 }
 
 - (void) set_front_process:unused {
-    [NSApp activateIgnoringOtherApps:YES];
-	
-    if ([self modalWindow] == nil) [self activateX:YES];
     QuartzMessageServerThread(kXDarwinBringAllToFront, 0);
 }