xserver: Branch 'server-1.10-branch'

[Jeremy Huddleston]

 hw/xquartz/X11Application.m |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a0b8dacbc016e38c92300ed421850e11848b8454
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Tue Jul 19 23:46:10 2011 -0700

    XQuartz: Adjust BUNDLE_ID_PREFIX to LAUNCHD_ID_PREFIX for server-1.10-branch
    
    Default builds will fail due to BUNDLE_ID_PREFIX not being defined.  LAUNCHD_ID_PREFIX
    was used in 1.10.x and earlier.
    
    This was fallout from 55ef10975e2e543ff99f7a75dd65722dc96ff873.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index d509870..8762dee 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -1002,7 +1002,7 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
 
     if (app_prefs_domain_cfstr == NULL) {
         ErrorF("X11ApplicationMain: Unable to determine bundle identifier.  Your installation of XQuartz may be broken.\n");
-        app_prefs_domain_cfstr = @BUNDLE_ID_PREFIX".X11";
+        app_prefs_domain_cfstr = @LAUNCHD_ID_PREFIX".X11";
     }
 
     [NSApp read_defaults];