From de78aab0ea3a2d8c61222493f25911258dea65a2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 14 May 2009 15:53:00 +1000
Subject: [PATCH] Xi: take the paired device as modifier device only for MD
 pointers.

---
 Xi/xipassivegrab.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index 2b77d18b6..d2dabba4f 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -157,7 +157,7 @@ ProcXIPassiveGrabDevice(ClientPtr client)
     if (!modifiers_failed)
         return BadAlloc;
 
-    if (dev->isMaster)
+    if (IsPointerDevice(dev) && dev->isMaster)
         mod_dev = GetPairedDevice(dev);
     else
         mod_dev = dev;