diff options
Diffstat (limited to 'hcid/dbus-database.c')
| -rw-r--r-- | hcid/dbus-database.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/hcid/dbus-database.c b/hcid/dbus-database.c index cf2369b1..41702d9b 100644 --- a/hcid/dbus-database.c +++ b/hcid/dbus-database.c @@ -74,7 +74,7 @@ static struct record_data *find_record(uint32_t handle, const char *sender) return NULL; } -static void exit_callback(const char *name, void *user_data) +static void exit_callback(void *user_data) { struct record_data *user_record = user_data; @@ -134,9 +134,10 @@ static DBusHandlerResult add_service_record(DBusConnection *conn, records = g_slist_append(records, user_record); - user_record->listener_id = name_listener_add(conn, sender, - exit_callback, - user_record); + user_record->listener_id = g_dbus_add_disconnect_watch(conn, sender, + exit_callback, + user_record, + NULL); reply = dbus_message_new_method_return(msg); if (!reply) @@ -174,7 +175,8 @@ int add_xml_record(DBusConnection *conn, const char *sender, bdaddr_t *src, records = g_slist_append(records, user_record); - name_listener_add(conn, sender, exit_callback, user_record); + g_dbus_add_disconnect_watch(conn, sender, exit_callback, user_record, + NULL); *handle = user_record->handle; @@ -317,7 +319,7 @@ int remove_record(DBusConnection *conn, const char *sender, if (!user_record) return -1; - name_listener_id_remove(user_record->listener_id); + g_dbus_remove_watch(conn, user_record->listener_id); records = g_slist_remove(records, user_record); |