From 390070876fc0b10daab553faf183a86243c6802b Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 3 Jun 2008 15:17:07 +0000 Subject: Fix manager unregistration --- serial/manager.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/serial/manager.c b/serial/manager.c index ae9d90d5..a9bc0968 100644 --- a/serial/manager.c +++ b/serial/manager.c @@ -1730,8 +1730,6 @@ static void proxy_path_free(gpointer data, gpointer udata) static void manager_unregister(void *data) { - char **dev; - if (pending_connects) { g_slist_foreach(pending_connects, (GFunc) pending_connect_free, NULL); @@ -1752,11 +1750,6 @@ static void manager_unregister(void *data) g_slist_free(ports_paths); ports_paths = NULL; } - - g_dbus_unregister_interface(connection, SERIAL_MANAGER_PATH, - SERIAL_MANAGER_INTERFACE); - - dbus_free_string_array(dev); } static GDBusMethodTable manager_methods[] = { @@ -1932,7 +1925,8 @@ int serial_manager_init(DBusConnection *conn) void serial_manager_exit(void) { - dbus_connection_destroy_object_path(connection, SERIAL_MANAGER_PATH); + g_dbus_unregister_interface(connection, SERIAL_MANAGER_PATH, + SERIAL_MANAGER_INTERFACE); dbus_connection_unref(connection); connection = NULL; -- cgit