xserver: Branch 'master'

[Ben Byer]

 miext/rootless/rootlessWindow.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 5ffb6a2fe8db5871eaf26b8535af1588c43f33d3
Author: Ben Byer <bbyer at apple.com>
Date:   Mon Apr 21 19:55:54 2008 -0700

    Nuke a call to deprecated LookupClient, and hopefully prevent a
    null-pointer dereference, too!
    (cherry picked from commit 3d28e9f953709914e18807bc74c241333671cb30)

diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index a6002bb..fa395a8 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -138,7 +138,6 @@ RootlessNativeWindowMoved (WindowPtr pWin)
   int sx, sy;
   XID vlist[2];
   Mask mask;
-  ClientPtr client;
   RootlessWindowRec *winRec = WINREC(pWin);
 
   if (xp_get_window_bounds ((xp_window_id)winRec->wid, &bounds) != Success) return;
@@ -152,14 +151,11 @@ RootlessNativeWindowMoved (WindowPtr pWin)
   vlist[1] = (INT16) bounds.y1 - sy;
   mask = CWX | CWY;
 
-  /* pretend we're the owner of the window! */
-  client = LookupClient (pWin->drawable.id, NullClient);
-
   /* Don't want to do anything to the physical window (avoids 
      notification-response feedback loops) */
 
   no_configure_window = TRUE;
-  ConfigureWindow (pWin, mask, vlist, client);
+  ConfigureWindow (pWin, mask, vlist, serverClient);
   no_configure_window = FALSE;
 }