From cc0f97ec2cb298bde87cd3753fd96f11ce41ff64 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 29 May 2008 14:43:27 +0000 Subject: Change name_listener API to libgdbus watch API --- daemon/database.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'daemon') diff --git a/daemon/database.c b/daemon/database.c index 47e21915..be6ca28c 100644 --- a/daemon/database.c +++ b/daemon/database.c @@ -69,7 +69,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; @@ -145,9 +145,9 @@ static DBusHandlerResult add_service_record_from_xml(DBusConnection *conn, records = g_slist_append(records, user_record); - user_record->listener_id = name_listener_add(conn, sender, + user_record->listener_id = g_dbus_add_disconnect_watch(conn, sender, exit_callback, - user_record); + user_record, NULL); reply = dbus_message_new_method_return(msg); if (!reply) @@ -176,7 +176,7 @@ static DBusHandlerResult remove_service_record(DBusConnection *conn, if (!user_record) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - name_listener_id_remove(user_record->listener_id); + g_dbus_remove_watch(conn, user_record->listener_id); remove_record_from_server(handle); -- cgit