frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Peter Hutterer 2010-07-22 09:24:08 +10:00
parent 4cd54d9ed9
commit 67ffbcc14c
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/kdrive/src/kinput.c
View File

@ -943,8 +943,6 @@ KdAddKeyboard (KdKeyboardInfo *ki)
return !Success; return !Success;
} }
ki->dixdev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
ki->dixdev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
RegisterOtherDevice(ki->dixdev); RegisterOtherDevice(ki->dixdev);
#ifdef DEBUG #ifdef DEBUG
@ -1014,8 +1012,6 @@ KdAddPointer (KdPointerInfo *pi)
return BadDevice; return BadDevice;
} }
pi->dixdev->deviceGrab.ActivateGrab = ActivatePointerGrab;
pi->dixdev->deviceGrab.DeactivateGrab = DeactivatePointerGrab;
RegisterOtherDevice(pi->dixdev); RegisterOtherDevice(pi->dixdev);
for (prev = &kdPointers; *prev; prev = &(*prev)->next); for (prev = &kdPointers; *prev; prev = &(*prev)->next);

2
hw/xfree86/common/xf86Xinput.c
View File

@ -351,8 +351,6 @@ xf86ActivateDevice(LocalDevicePtr local)
dev->type = SLAVE; dev->type = SLAVE;
dev->spriteInfo->spriteOwner = FALSE; dev->spriteInfo->spriteOwner = FALSE;
dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
dev->config_info = xf86SetStrOption(local->options, "config_info", NULL); dev->config_info = xf86SetStrOption(local->options, "config_info", NULL);
RegisterOtherDevice(dev); RegisterOtherDevice(dev);