From 0a5888393c68f6f7db86206d1f277232db18240b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 4 Mar 2011 13:54:03 +0000
Subject: xserver xkeyboard-config mesa git update 4 Marc 2011

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

(limited to 'xorg-server/Xi/xiwarppointer.c')

diff --git a/xorg-server/Xi/xiwarppointer.c b/xorg-server/Xi/xiwarppointer.c
index c01b115f3..a463ab94d 100644
--- a/xorg-server/Xi/xiwarppointer.c
+++ b/xorg-server/Xi/xiwarppointer.c
@@ -97,7 +97,7 @@ ProcXIWarpPointer(ClientPtr client)
         return rc;
     }
 
-    if ((!IsMaster(pDev) && pDev->u.master) ||
+    if ((!IsMaster(pDev) && !IsFloating(pDev)) ||
         (IsMaster(pDev) && !IsPointerDevice(pDev)))
     {
         client->errorValue = stuff->deviceid;
-- 
cgit v1.2.3