From 67ffbcc14cbc61474520d4531599edca24965543 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 22 Jul 2010 09:24:08 +1000 Subject: xfree86: remove superflous assignments. ActivateGrab and DeactivateGrab are set in AddInputDevice() already. Signed-off-by: Peter Hutterer Reviewed-by: Adam Jackson Reviewed-by: Daniel Stone --- hw/kdrive/src/kinput.c | 4 ---- hw/xfree86/common/xf86Xinput.c | 2 -- 2 files changed, 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); -- cgit v1.2.3