diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-05-27 18:16:17 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-05-27 18:16:17 +0000 |
| commit | e8961085b8d3dabc5550a4f1b309ae06065d14b4 (patch) | |
| tree | 4092a0aa860dffb5b1b354ba87e5132f4fde9894 /input/manager.c | |
| parent | ee47f9f75ecc4ea8756f9b301905ec7de5ac07a3 (diff) | |
Convert the input device handling to gdbus API
Diffstat (limited to 'input/manager.c')
| -rw-r--r-- | input/manager.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/input/manager.c b/input/manager.c index b65ccb16..aae101fd 100644 --- a/input/manager.c +++ b/input/manager.c @@ -332,7 +332,7 @@ static int create_bonding(struct pending_req *pr) char address[18], *addr_ptr = address; msg = dbus_message_new_method_call("org.bluez", pr->adapter_path, - "org.bluez.Adapter", "CreateBonding"); + "org.bluez.Adapter", "CreateBonding"); if (!msg) { error("Unable to allocate new method call"); return -1; @@ -589,7 +589,6 @@ static DBusMessage *create_device(DBusConnection *conn, static DBusMessage *remove_device(DBusConnection *conn, DBusMessage *msg, void *data) { - DBusMessage *reply; GSList *l; const char *path; int err; @@ -602,20 +601,14 @@ static DBusMessage *remove_device(DBusConnection *conn, if (!l) return does_not_exist(msg); - reply = dbus_message_new_method_return(msg); - if (!reply) - return NULL; - err = input_device_unregister(conn, path); - if (err < 0) { - dbus_message_unref(reply); + if (err < 0) return create_errno_message(msg, -err); - } g_free(l->data); device_paths = g_slist_remove(device_paths, l->data); - return reply; + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } static DBusMessage *list_devices(DBusConnection *conn, |