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

Jeremy Huddleston jeremyhu at kemper.freedesktop.org
Sun Sep 6 14:04:16 PDT 2009


 hw/xquartz/mach-startup/launchd_fd.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 647c871dc9f2d0adc172b401cde89ffbdfcc4d7a
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sun Sep 6 14:02:53 2009 -0700

    XQuartz: launchd: Fallback on :0 if prefix:0 gives an error for the socket name

diff --git a/hw/xquartz/mach-startup/launchd_fd.c b/hw/xquartz/mach-startup/launchd_fd.c
index 51017d6..fa623ea 100644
--- a/hw/xquartz/mach-startup/launchd_fd.c
+++ b/hw/xquartz/mach-startup/launchd_fd.c
@@ -71,8 +71,11 @@ int launchd_display_fd() {
     
     listening_fd_array = launch_data_dict_lookup(sockets_dict, LAUNCHD_ID_PREFIX":0");
     if (NULL == listening_fd_array) {
-        fprintf(stderr,"launchd check-in: No known sockets found to answer requests on!  %s failed.\n", LAUNCHD_ID_PREFIX".startx:0");
-        return ERROR_FD;
+        listening_fd_array = launch_data_dict_lookup(sockets_dict, ":0");
+        if (NULL == listening_fd_array) {
+            fprintf(stderr,"launchd check-in: No known sockets found to answer requests on! \"%s:0\" and \":0\" failed.\n", LAUNCHD_ID_PREFIX);
+            return ERROR_FD;
+        }
     }
     
     if (launch_data_array_get_count(listening_fd_array)!=1) {


More information about the xorg-commit mailing list