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

[Ben Byer]

 hw/darwin/apple/bundle-main.c |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 7e8515715f303a3b042cc38b2a02a6ea1551ea45
Merge: f543cb8... 7fc12de...
Author: Ben Byer <bbyer at bbyer.local>
Date:   Fri Nov 30 11:20:47 2007 -0800

    Merge branch 'xorg-server-1.2-apple' of ssh://git.freedesktop.org/git/xorg/xserver into xorg-server-1.2-apple

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

    properly implemented xcb check for stale sockets

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;
 }