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

[George Peter Staplin]

 miext/rootless/rootlessWindow.c |   24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

New commits:
commit 3de250e28a9a86bcae4464a15c2025805877ce1e
Author: George Peter Staplin <gps at Georges-Workstation.local>
Date:   Thu Oct 23 16:19:58 2008 -0600

    miext/rootless: Fix the usage of DeleteProperty so that this builds again.

diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index d91db0f..2a16dc8 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -273,6 +273,12 @@ RootlessGetShape(WindowPtr pWin, RegionPtr pShape)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
 
+    /* 
+     * Avoid a warning.  
+     * REGION_NULL and the other macros don't actually seem to use pScreen.
+     */
+    (void)pScreen; 
+
     if (wBoundingShape(pWin) == NULL)
         return FALSE;
 
@@ -1606,15 +1612,19 @@ RootlessDisableRoot (ScreenPtr pScreen)
 {
     WindowPtr pRoot;
     RootlessWindowRec *winRec;
-    
+
     pRoot = WindowTable[pScreen->myNum];
     winRec = WINREC (pRoot);
-    
-    if (winRec != NULL)
-    {
-        RootlessDestroyFrame (pRoot, winRec);
-        DeleteProperty (pRoot, xa_native_window_id ());
-    }
+
+    if (NULL == winRec)
+	return;
+           
+    RootlessDestroyFrame (pRoot, winRec);
+    /* 
+     * gstaplin: I fixed the usage of this DeleteProperty so that it would compile.
+     * QUESTION: Where is this xa_native_window_id set?
+     */
+    DeleteProperty (serverClient, pRoot, xa_native_window_id ());
 }
 
 void