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

[Jeremy Huddleston]

 hw/xquartz/bundle/server-main.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 3357ef0f40b4d6c1c93c3c54bfc6e9a5168b056f
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Sat Dec 8 01:24:58 2007 -0800

    Xquartz: Use org.x.X11 instead of com.apple.X11 for preferences
    Fixed inconsistency so preferences get read from the correct source.
    (cherry picked from commit a74c38bd9f28735acd602d359d7ca6357aed1e93)

diff --git a/hw/xquartz/bundle/server-main.c b/hw/xquartz/bundle/server-main.c
index 26fcbb0..205e87c 100644
--- a/hw/xquartz/bundle/server-main.c
+++ b/hw/xquartz/bundle/server-main.c
@@ -138,8 +138,7 @@ read_boolean_pref (CFStringRef name, int default_)
     int value;
     Boolean ok;
 	
-    value = CFPreferencesGetAppBooleanValue (name,
-											 CFSTR ("com.apple.x11"), &ok);
+    value = CFPreferencesGetAppBooleanValue (name, CFSTR ("org.x.x11"), &ok);
     return ok ? value : default_;
 }