diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-27 06:40:50 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-27 06:40:50 +0000 |
| commit | 619d6f3626f36af85cc40eeee95c7585d906fe5c (patch) | |
| tree | 0428401464cc6127a651c94261678072cb3bafc3 /xorg-server/config | |
| parent | d89c0289565a662a378df6e3c05de42982ab1c9d (diff) | |
| parent | 80cb6bca9f771ef15c00cc41af2b9f315d66258d (diff) | |
| download | vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.tar.gz vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.tar.bz2 vcxsrv-619d6f3626f36af85cc40eeee95c7585d906fe5c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/config')
| -rw-r--r-- | xorg-server/config/config.c | 2 | ||||
| -rw-r--r-- | xorg-server/config/dbus.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/config/config.c b/xorg-server/config/config.c index a14d2a9f8..1ffbdcdad 100644 --- a/xorg-server/config/config.c +++ b/xorg-server/config/config.c @@ -81,7 +81,7 @@ remove_device(const char *backend, DeviceIntPtr dev) * already been removed. */
OsBlockSignals();
ProcessInputEvents();
- DeleteInputDeviceRequest(dev, 0);
+ DeleteInputDeviceRequest(dev);
OsReleaseSignals();
}
diff --git a/xorg-server/config/dbus.c b/xorg-server/config/dbus.c index 3b4330adc..d6316623b 100644 --- a/xorg-server/config/dbus.c +++ b/xorg-server/config/dbus.c @@ -226,7 +226,7 @@ remove_device(DBusMessage *message, DBusMessage *reply, DBusError *error) * already been removed. */
OsBlockSignals();
ProcessInputEvents();
- DeleteInputDeviceRequest(dev, 0);
+ DeleteInputDeviceRequest(dev);
OsReleaseSignals();
ret = Success;
|