summaryrefslogtreecommitdiff
path: root/Xext/security.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2007-05-14 12:34:53 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2007-05-14 12:34:53 +0930
commit5c680e94938c16e04a4349715cf11796b80400db (patch)
tree256c57eea6c0fc52a09c6d07079a5df772b19c76 /Xext/security.c
parent4dc973f08c54294e06bc831bd2839fd3aa24ecfb (diff)
Remove double-grab option. We only want one grab per device.
Diffstat (limited to 'Xext/security.c')
-rw-r--r--Xext/security.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/Xext/security.c b/Xext/security.c
index 18ab496b9..715bc31d1 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -822,13 +822,10 @@ CALLBACK(SecurityCheckDeviceAccess)
untrusted_got_event = FALSE;
found_event_window = FALSE;
- /* We can just use coreGrab as a comment a few lines above clearly states
- "device security other than keyboard is not implemented yet". The core
- kbd should never have a device grab set. */
- if (dev->coreGrab.grab)
+ if (dev->deviceGrab.grab)
{
untrusted_got_event =
- (TRUSTLEVEL(rClient(dev->coreGrab.grab)) != XSecurityClientTrusted);
+ (TRUSTLEVEL(rClient(dev->deviceGrab.grab)) != XSecurityClientTrusted);
}
else
{