From 2a49ffa3c94819e9f28dd939f23ee8a675258172 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 9 Mar 2011 09:53:47 +1000
Subject: Xi: return the bad device ID if a passive grab fails with BadDevice.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
---
 Xi/xipassivegrab.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Xi')

diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index 3319ef913..22f905e8f 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -99,7 +99,10 @@ ProcXIPassiveGrabDevice(ClientPtr client)
     {
         ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
         if (ret != Success)
+        {
+            client->errorValue = stuff->deviceid;
             return ret;
+        }
     }
 
     if (stuff->grab_type != XIGrabtypeButton &&
-- 
cgit v1.2.3