xserver: Branch 'mpx'

[Peter Hutterer]

 dix/events.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
diff-tree 2c1431a76e7219e3bd14fd7f7888a8bc4fea0f58 (from 14d0397cded699378fa3c19f4e61dbab7d3a9b2c)
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Mon Aug 20 10:06:13 2007 +0930

    dix: ProcChangeActivePointerGrab: make sure variable is initialised.
    
    Thanks to Ben Close for spotting it.

diff --git a/dix/events.c b/dix/events.c
index 76894ca..4c9ca3b 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4808,7 +4808,7 @@ int
 ProcChangeActivePointerGrab(ClientPtr client)
 {
     DeviceIntPtr device, grabbed;
-    GrabPtr      grab = device->deviceGrab.grab;
+    GrabPtr      grab;
     CursorPtr newCursor, oldCursor;
     REQUEST(xChangeActivePointerGrabReq);
     TimeStamp time;
@@ -4831,7 +4831,11 @@ ProcChangeActivePointerGrab(ClientPtr cl
 	    return BadCursor;
 	}
     }
-    if (!grab && !SameClient(grab, client))
+
+    device = PickPointer(client);
+    grab = device->deviceGrab.grab;
+
+    if (!grab || !SameClient(grab, client))
     {
         /* no grab on ClientPointer, or some other client has a grab on our
          * ClientPointer, let's check if we have a pointer grab on some other