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

[Jeremy Huddleston]

 hw/xquartz/bundle/Info.plist |    6 +++---
 hw/xquartz/quartzAudio.c     |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 71dd052412400362793f2f0c7c02bf4f4309738c
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sun Nov 2 15:52:22 2008 -0800

    XQuartz: Replace deprecated API usage thanks to Robery Murphy

diff --git a/hw/xquartz/quartzAudio.c b/hw/xquartz/quartzAudio.c
index 2e8f3a4..603ca4a 100644
--- a/hw/xquartz/quartzAudio.c
+++ b/hw/xquartz/quartzAudio.c
@@ -337,7 +337,8 @@ void QuartzAudioInit(void)
     // fixme assert fadeLength<framesPerBuffer
 
     // Prepare for playback
-    status = AudioDeviceAddIOProc(outputDevice, QuartzAudioIOProc, &data);
+    AudioDeviceIOProcID sInputIOProcID = NULL;
+    status = AudioDeviceCreateIOProcID( outputDevice, QuartzAudioIOProc, NULL, &sInputIOProcID );
     if (status) {
         ErrorF("QuartzAudioInit: AddIOProc returned %ld\n", (long)status);
         return;
commit 81bb4128570b44d779126a8dffcd3c5620747383
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Oct 31 20:18:27 2008 -0700

    XQuartz: version string updated for 2.3.2_beta3

diff --git a/hw/xquartz/bundle/Info.plist b/hw/xquartz/bundle/Info.plist
index ea37725..208f8e5 100644
--- a/hw/xquartz/bundle/Info.plist
+++ b/hw/xquartz/bundle/Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>2.3.2</string>
+		<string>2.3.1.91.3</string>
 	<key>CFBundleVersion</key>
-		<string>2.3.2</string>
+		<string>2.3.1.91.3</string>
 	<key>CFBundleVersionString</key>
-		<string>2.3.2</string>
+		<string>2.3.1.91.3</string>
 	<key>CFBundleSignature</key>
 		<string>x11a</string>
 	<key>CSResourcesFileMapped</key>