diff options
author | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
commit | 4b1326f06330c00501dd84100ed3a1987e2fa631 (patch) | |
tree | 6675ebcf771a6fdfeb9a2164f08811407731482e /xorg-server/config/dbus.c | |
parent | 7397e255c2e82618ab55ef2c81636c8e688b1225 (diff) | |
parent | 163827567b71b0763a4c1a7104159cd08b5c2d95 (diff) | |
download | vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.gz vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.bz2 vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.zip |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/config/dbus.c')
-rw-r--r-- | xorg-server/config/dbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/config/dbus.c b/xorg-server/config/dbus.c index 37462ace0..86d9d287f 100644 --- a/xorg-server/config/dbus.c +++ b/xorg-server/config/dbus.c @@ -147,7 +147,7 @@ add_device(DBusMessage *message, DBusMessage *reply, DBusError *error) dbus_message_iter_next(&iter); } - ret = NewInputDeviceRequest(options, &dev); + ret = NewInputDeviceRequest(options, NULL, &dev); if (ret != Success) { DebugF("[config/dbus] NewInputDeviceRequest failed\n"); goto unwind; |