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

[Jeremy Huddleston]

 hw/xquartz/pbproxy/x-selection.m |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit bb330a1b1c480e89727fb75ff5aeb71f4afc5ee3
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sun Oct 26 13:17:49 2008 -0700

    XQuartz: pbproxy: fixed blocking

diff --git a/hw/xquartz/pbproxy/x-selection.m b/hw/xquartz/pbproxy/x-selection.m
index b95dfbf..f17970c 100644
--- a/hw/xquartz/pbproxy/x-selection.m
+++ b/hw/xquartz/pbproxy/x-selection.m
@@ -250,11 +250,12 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 	{
 	    string = True;
 	}
-    else
-    {
-        const char *type = XGetAtomName(x_dpy, a);
-        DB("Unhandled X11 mime type: %s", type);
-        Xfree(type);
+	else
+	{
+	    char *type = XGetAtomName(x_dpy, a);
+	    DB("Unhandled X11 mime type: %s", type);
+	    XFree(type);
+	}
     }
 
     /*We prefer PNG over strings, and UTF8 over a Latin-1 string.*/