xserver: Branch 'master'

[Jeremy Huddleston]

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

New commits:
commit 5dd895efa305954e2695aa22a9e49acfb65b4d5e
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Fri Dec 21 02:06:47 2007 -0800

    XQuartz: Use CFStringCreateWithCString
    (cherry picked from commit 79782b0e14761dcf5d6635b8eec161b74f06763a)

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