ActivateGrab and DeactivateGrab are set in AddInputDevice() already. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> --- hw/kdrive/src/kinput.c | 4 ---- 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 80a1458..fcb02b5 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 57c866d..65eea0e 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -355,8 +355,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); -- 1.7.2 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel