xserver: Branch 'master'

[Jeremy Huddleston]

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

New commits:
commit beb29c605b8c66e1a18b89668aa421c1519645f6
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Fri Dec 21 02:09:01 2007 -0800

    XQuartz: *REALLY* use CFStringCreateWithCString
    I need sleep!  Why am I making these stupid mistakes... sorry for pointless commit spam.  ugg.
    (cherry picked from commit b16351fc6457aabead328472d16dc25789032940)

diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index c668567..df78d7f 100644
--- a/hw/xquartz/bundle/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
@@ -104,7 +104,7 @@ static char *command_from_prefs(const char *key, const char *default_value) {
     CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
     
     if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
-        CFStringRef cfDefaultValue = CFStringCreateWithPascalString(NULL, default_value, kCFStringEncodingASCII);
+        CFStringRef cfDefaultValue = CFStringCreateWithCString(NULL, default_value, kCFStringEncodingASCII);
 
         CFPreferencesSetAppValue(cfKey, cfDefaultValue, kCFPreferencesCurrentApplication);
         CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);