xserver: Branch 'master'

[Jeremy Huddleston]

 hw/darwin/apple/bundle-main.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 83ba1e167c1473ac7d85239a6ee5ed629353cb16
Author: Ben Byer <bbyer at bbyer.local>
Date:   Sat Dec 1 18:28:19 2007 -0800

    added missing call to xcb_connect()
    (cherry picked from commit dc2fb323ee11f081d447605be151024f9e2487f9)

diff --git a/hw/darwin/apple/bundle-main.c b/hw/darwin/apple/bundle-main.c
index d46e7b2..10d2f20 100644
--- a/hw/darwin/apple/bundle-main.c
+++ b/hw/darwin/apple/bundle-main.c
@@ -613,8 +613,9 @@ display_exists_p (int number)
     sprintf (buf, "/tmp/.X11-unix/X%d", number);
     if (access (buf, F_OK) != 0)
 		return FALSE;
-	
+    
     sprintf (buf, ":%d", number);
+    conn = xcb_connect(buf, NULL);
     if (xcb_connection_has_error(conn)) return FALSE;
 	
     xcb_disconnect(conn);