diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-26 08:58:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-26 08:58:03 +0000 |
| commit | e60ed91097aa7511581b6c53b9e4b14aaf1027b5 (patch) | |
| tree | c8ce06db36103141858e95febad857ca989e7ad0 /xorg-server/config | |
| parent | fb91c8589937f1a9aba5d5a4e0de98c381dfe9b8 (diff) | |
| parent | fade1b113f18f3fd26c3c01ca4543effa80b9b62 (diff) | |
| download | vcxsrv-e60ed91097aa7511581b6c53b9e4b14aaf1027b5.tar.gz vcxsrv-e60ed91097aa7511581b6c53b9e4b14aaf1027b5.tar.bz2 vcxsrv-e60ed91097aa7511581b6c53b9e4b14aaf1027b5.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 1ffbdcdad..a14d2a9f8 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);
+ DeleteInputDeviceRequest(dev, 0);
OsReleaseSignals();
}
diff --git a/xorg-server/config/dbus.c b/xorg-server/config/dbus.c index d6316623b..3b4330adc 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);
+ DeleteInputDeviceRequest(dev, 0);
OsReleaseSignals();
ret = Success;
|