From b697c4ed145968d3c3281bb85e628f1b068b09fc Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue, 16 Oct 2007 17:47:06 +0930
Subject: dix: CheckPassiveGrabOnWindow: only get paired device for
 non-keyboards.

---
 dix/events.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dix/events.c b/dix/events.c
index 50d06c465..d342d3628 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3243,7 +3243,12 @@ CheckPassiveGrabsOnWindow(
 
 	gdev= grab->modifierDevice;
         if (grab->coreGrab)
-            gdev = GetPairedDevice(device);
+        {
+            if (IsPointerDevice(device))
+                gdev = GetPairedDevice(device);
+            else
+                gdev = device;
+        }
 	xkbi= gdev->key->xkbInfo;
 #endif
 	tempGrab.modifierDevice = grab->modifierDevice;
-- 
cgit v1.2.3