diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-18 10:36:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-18 10:36:39 +0000 |
| commit | 07d3578ce63d87c9a87d54d85f5c8057d30fdc58 (patch) | |
| tree | d8acfcb63e11aa7f91c1d9685b5c2f55cd7133c7 /xorg-server/dix/devices.c | |
| parent | 4d025671124c9f6d91c1c165fc892b1609fdce12 (diff) | |
| parent | 2aa7bcf37f00b7884ae166d62db81493ea37934a (diff) | |
| download | vcxsrv-07d3578ce63d87c9a87d54d85f5c8057d30fdc58.tar.gz vcxsrv-07d3578ce63d87c9a87d54d85f5c8057d30fdc58.tar.bz2 vcxsrv-07d3578ce63d87c9a87d54d85f5c8057d30fdc58.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix/devices.c')
| -rw-r--r-- | xorg-server/dix/devices.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c index d9a59d8db..625fd3aaa 100644 --- a/xorg-server/dix/devices.c +++ b/xorg-server/dix/devices.c @@ -2119,9 +2119,6 @@ ProcChangePointerControl(ClientPtr client) REQUEST(xChangePointerControlReq);
REQUEST_SIZE_MATCH(xChangePointerControlReq);
- if (!mouse->ptrfeed->CtrlProc)
- return BadDevice;
-
ctrl = mouse->ptrfeed->ctrl;
if ((stuff->doAccel != xTrue) && (stuff->doAccel != xFalse)) {
client->errorValue = stuff->doAccel;
@@ -2169,7 +2166,7 @@ ProcChangePointerControl(ClientPtr client) for (dev = inputInfo.devices; dev; dev = dev->next) {
if ((dev == mouse || (!IsMaster(dev) && dev->u.master == mouse)) &&
- dev->ptrfeed && dev->ptrfeed->CtrlProc) {
+ dev->ptrfeed) {
rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixManageAccess);
if (rc != Success)
return rc;
@@ -2178,9 +2175,8 @@ ProcChangePointerControl(ClientPtr client) for (dev = inputInfo.devices; dev; dev = dev->next) {
if ((dev == mouse || (!IsMaster(dev) && dev->u.master == mouse)) &&
- dev->ptrfeed && dev->ptrfeed->CtrlProc) {
+ dev->ptrfeed) {
dev->ptrfeed->ctrl = ctrl;
- (*dev->ptrfeed->CtrlProc)(dev, &mouse->ptrfeed->ctrl);
}
}
|