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

[Jeremy Huddleston]

 configure.ac                     |    2 +-
 hw/xquartz/bundle/Info.plist     |    6 +++---
 hw/xquartz/pbproxy/x-selection.m |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit af9b1c164bf3ed17af256dc2be33bb992092677e
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Oct 4 21:07:50 2008 -0700

    1.4.2-apple18

diff --git a/configure.ac b/configure.ac
index 537665f..7fdea9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.2-apple17, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.2-apple18, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
commit 2021c4c4e726a6b8f27f19f16ed3d86e37dbe448
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Oct 4 21:07:31 2008 -0700

    XQuartz: Bumped bundle version to 2.3.2 for beta1

diff --git a/hw/xquartz/bundle/Info.plist b/hw/xquartz/bundle/Info.plist
index 2582b92..ea37725 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.1</string>
+		<string>2.3.2</string>
 	<key>CFBundleVersion</key>
-		<string>2.3.1</string>
+		<string>2.3.2</string>
 	<key>CFBundleVersionString</key>
-		<string>2.3.1</string>
+		<string>2.3.2</string>
 	<key>CFBundleSignature</key>
 		<string>x11a</string>
 	<key>CSResourcesFileMapped</key>
commit 9b5d11409264080e394c8f18e06237122de80014
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Oct 4 21:06:58 2008 -0700

    XQuartz: pbcopy: Re-enabled some code I commented out for testing

diff --git a/hw/xquartz/pbproxy/x-selection.m b/hw/xquartz/pbproxy/x-selection.m
index 67de866..6a1a9fd 100644
--- a/hw/xquartz/pbproxy/x-selection.m
+++ b/hw/xquartz/pbproxy/x-selection.m
@@ -421,10 +421,10 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
         if(owner == _selection_window)
             return TRUE;
 
-//        if(None != _selection_window) {
-//            fprintf (stderr, "A clipboard manager is already running.  pbproxy will not sync clipboard to pasteboard.\n");
-//            return FALSE;
-//        }
+        if(None != _selection_window) {
+            fprintf (stderr, "A clipboard manager is already running.  pbproxy will not sync clipboard to pasteboard.\n");
+            return FALSE;
+        }
         
         XSetSelectionOwner(x_dpy, atoms->clipboard_manager, _selection_window, CurrentTime);
         return (_selection_window == XGetSelectionOwner(x_dpy, atoms->clipboard_manager));