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

[George Peter Staplin]

 hw/xquartz/applewm.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d1d398db762fe7d5720f9b5fafa2bbe8372fceac
Author: George Staplin <gstaplin at apple.com>
Date:   Thu Nov 13 01:27:33 2008 -0700

    XQuartz: Restore the logic of AppleWMDoReorderWindow to the same as the 1.4 branch.
    
    It was returning inverted values in comparison to the 1.4 branch.  This resulted in
    the windows not drawing due to a deep path of: RootlessReorderWindow ->
    SCREENREC(pScreen)->imp->DoReorderWindow(winRec) - > xprDoReorderWindow ->
    AppleWMDoReorderWindow.

diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index ba86f10..6c624d0 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -175,7 +175,11 @@ AppleWMDoReorderWindow(
 
     atom = xa_apple_no_order_in();
     rc = dixLookupProperty(&prop, pWin, atom, serverClient, DixReadAccess);
-    return (rc == Success) && (prop->type == atom);
+    
+    if(Success == rc && prop->type == atom)
+	return 0;
+    
+    return 1;
 }