xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 31005efb1bb6be5a892ff905f754109dc3fa8fe6
Author: Fernando Carrijo <fcarrijo at yahoo.com.br>
Date:   Mon Nov 10 13:23:45 2008 -0500

    input: Remove useless conditional.

diff --git a/dix/events.c b/dix/events.c
index 632c0f4..7ec5355 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3762,11 +3762,7 @@ ProcessKeyboardEvent (xEvent *xE, DeviceIntPtr keybd, int count)
     Bool            deactivateGrab = FALSE;
     KeyClassPtr     keyc = keybd->key;
 
-    if (xE->u.u.type & EXTENSION_EVENT_BASE)
-        grabinfo = &keybd->deviceGrab;
-    else
-        grabinfo = &keybd->deviceGrab;
-
+    grabinfo = &keybd->deviceGrab;
     grab = grabinfo->grab;
 
     if (!syncEvents.playingEvents)