xserver: Branch 'master'

[Peter Hutterer]

 xkb/xkbActions.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 449723510a1f9d024e23d9eb33795cac27f9443e
Author: Egbert Eich <eich at pdx.freedesktop.org>
Date:   Tue Apr 22 13:30:03 2008 +0930

    xkb: use the correct device instead of an uninitialised "dev". #15614
    
    X.Org Bug 15614 <http://bugs.freedesktop.org/show_bug.cgi?id=15614>
    
    Signed-off-by: Peter Hutterer <peter at cs.unisa.edu.au>

diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 8c72874..f226b6b 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -1031,7 +1031,7 @@ _XkbFilterDeviceBtn(	XkbSrvInfoPtr	xkbi,
 DeviceIntPtr	dev;
 int		button;
 
-    if (dev == inputInfo.keyboard)
+    if (xkbi->device == inputInfo.keyboard)
         return 0;
 
     if (filter->keycode==0) {		/* initial press */