xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 dix/events.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d91243beb63008fff2ce6affa7db091786e8c49a
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Fri Nov 7 08:39:38 2008 +1030

    dix: formatting fix.

diff --git a/dix/events.c b/dix/events.c
index 9cdf49f..05f9947 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4383,7 +4383,8 @@ EnterNotifies(DeviceIntPtr pDev,
 	return;
     EnterNotifies(pDev, ancestor, parent, mode, detail);
     EnterLeaveEvent(pDev, EnterNotify, mode, detail, parent,
-                    child->drawable.id); }
+                    child->drawable.id);
+}
 
 
 /**
commit dde09076c5c0c36a4a9321cd23a2c7922c4c755b
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Wed Nov 5 12:52:03 2008 +1030

    dix: remove superfluous variable devgrab
    
    grab == devgrab anyway, this is a leftover from the time when we had two
    different grabs per device (core and XI grab).
    
    Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>

diff --git a/dix/events.c b/dix/events.c
index 7ec5355..9cdf49f 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4214,7 +4214,6 @@ EnterLeaveEvent(
     WindowPtr		focus;
     DeviceIntPtr        keybd;
     GrabPtr	        grab = mouse->deviceGrab.grab;
-    GrabPtr	        devgrab = mouse->deviceGrab.grab;
     Mask		mask;
     int                 inWindow; /* zero if no sprites are in window */
     Bool                sendevent = FALSE;
@@ -4336,11 +4335,11 @@ EnterLeaveEvent(
        (filters[mouse->id][devEnterLeave->type] &
             inputMasks->deliverableEvents[mskidx]))
     {
-        if (devgrab)
-            (void)TryClientEvents(rClient(devgrab), mouse,
+        if (grab)
+            (void)TryClientEvents(rClient(grab), mouse,
                                 (xEvent*)devEnterLeave, 1,
                                 mask, filters[mouse->id][devEnterLeave->type],
-                                devgrab);
+                                grab);
 	else
 	    (void)DeliverEventsToWindow(mouse, pWin, (xEvent*)devEnterLeave,
                                    1, filters[mouse->id][devEnterLeave->type],