diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-08-03 19:49:59 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-13 15:58:06 +1000 |
| commit | 1c1811ecafc144151630b3588394e2c345c53aa4 (patch) | |
| tree | 509ec47e0e3c233362a826d873005e1d8cc8ce3c /dix | |
| parent | c360b3eb1deeac51913e7b1286b2767711c541fc (diff) | |
CheckDeviceGrabs: Delete redundant pWin->optional test.
CheckPassiveGrabsOnWindow returns FALSE if pWin->optional is NULL,
because wPassiveGrabs uses wUseDefault, so don't bother checking at the
caller.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/events.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dix/events.c b/dix/events.c index e03e58c02..51a04d526 100644 --- a/dix/events.c +++ b/dix/events.c @@ -3636,8 +3636,7 @@ CheckDeviceGrabs(DeviceIntPtr device, DeviceEvent *event, int checkFirst) for (; i < focus->traceGood; i++) { pWin = focus->trace[i]; - if (pWin->optional && - CheckPassiveGrabsOnWindow(pWin, device, event, sendCore)) + if (CheckPassiveGrabsOnWindow(pWin, device, event, sendCore)) return TRUE; } @@ -3651,8 +3650,7 @@ CheckDeviceGrabs(DeviceIntPtr device, DeviceEvent *event, int checkFirst) for (; i < device->spriteInfo->sprite->spriteTraceGood; i++) { pWin = device->spriteInfo->sprite->spriteTrace[i]; - if (pWin->optional && - CheckPassiveGrabsOnWindow(pWin, device, event, sendCore)) + if (CheckPassiveGrabsOnWindow(pWin, device, event, sendCore)) return TRUE; } |