diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-07-22 09:24:08 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-09-01 15:26:47 +1000 |
| commit | 67ffbcc14cbc61474520d4531599edca24965543 (patch) | |
| tree | 9915ff41a4ac94874331b12d16aa0dbd07484df4 | |
| parent | 4cd54d9ed9e87074734789a9a7708c2218f87f1e (diff) | |
xfree86: remove superflous assignments.
ActivateGrab and DeactivateGrab are set in AddInputDevice() already.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | hw/kdrive/src/kinput.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 80a1458b1..fcb02b5b3 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -943,8 +943,6 @@ KdAddKeyboard (KdKeyboardInfo *ki) return !Success; } - ki->dixdev->deviceGrab.ActivateGrab = ActivateKeyboardGrab; - ki->dixdev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab; RegisterOtherDevice(ki->dixdev); #ifdef DEBUG @@ -1014,8 +1012,6 @@ KdAddPointer (KdPointerInfo *pi) return BadDevice; } - pi->dixdev->deviceGrab.ActivateGrab = ActivatePointerGrab; - pi->dixdev->deviceGrab.DeactivateGrab = DeactivatePointerGrab; RegisterOtherDevice(pi->dixdev); for (prev = &kdPointers; *prev; prev = &(*prev)->next); diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index dcfbcde39..f773ac2d6 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -351,8 +351,6 @@ xf86ActivateDevice(LocalDevicePtr local) dev->type = SLAVE; dev->spriteInfo->spriteOwner = FALSE; - dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab; - dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab; dev->config_info = xf86SetStrOption(local->options, "config_info", NULL); RegisterOtherDevice(dev); |