Fix breakage caused by libgdbus API change

diff --git a/src/agent.c b/src/agent.c
index 586dd14..2d0f365 100644 (file)
--- a/src/agent.c
+++ b/src/agent.c
@@ -47,13 +47,11 @@ static void agent_free(void)
        agent_path = NULL;
 }
 
-static gboolean agent_disconnect(void *data)
+static void agent_disconnect(void *data)
 {
        DBG("data %p", data);
 
        agent_free();
-
-       return TRUE;
 }
 
 int __connman_agent_register(const char *sender, const char *path)

diff --git a/src/iface.c b/src/iface.c
index b2fd6d1..ea52673 100644 (file)
--- a/src/iface.c
+++ b/src/iface.c
@@ -1301,8 +1301,6 @@ static int probe_device(LibHalContext *ctx,
 
        conn = libhal_ctx_get_dbus_connection(ctx);
 
-       g_dbus_register_object(conn, iface->path, iface, device_free);
-
        interfaces = g_slist_append(interfaces, iface);
 
        if (iface->flags & CONNMAN_IFACE_FLAG_IPV4) {
@@ -1313,7 +1311,8 @@ static int probe_device(LibHalContext *ctx,
 
        g_dbus_register_interface(conn, iface->path,
                                        CONNMAN_IFACE_INTERFACE,
-                                       iface_methods, iface_signals, NULL);
+                                       iface_methods, iface_signals, NULL,
+                                                       iface, device_free);
 
        DBG("iface %p identifier %s", iface, iface->identifier);
 
@@ -1373,7 +1372,6 @@ static void device_removed(LibHalContext *ctx, const char *udi)
                        interfaces = g_slist_remove(interfaces, iface);
                        g_dbus_unregister_interface(conn, iface->path,
                                                CONNMAN_IFACE_INTERFACE);
-                       g_dbus_unregister_object_hierarchy(conn, iface->path);
                        break;
                }
        }
@@ -1476,8 +1474,6 @@ static void hal_cleanup(void *data)
 
                g_dbus_unregister_interface(conn, iface->path,
                                                CONNMAN_IFACE_INTERFACE);
-
-               g_dbus_unregister_object_hierarchy(conn, iface->path);
        }
 
        g_slist_free(interfaces);

diff --git a/src/manager.c b/src/manager.c
index 9d14cd7..7de3668 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -201,9 +201,9 @@ static DBusMessage *nm_state(DBusConnection *conn,
 }
 
 static GDBusMethodTable nm_methods[] = {
-       { "sleep",                 "",  "",   nm_sleep        },
-       { "wake",                  "",  "",   nm_wake         },
-       { "state",                 "",  "u",  nm_state        },
+       { "sleep", "",  "",   nm_sleep        },
+       { "wake",  "",  "",   nm_wake         },
+       { "state", "",  "u",  nm_state        },
        { },
 };
 
@@ -218,18 +218,14 @@ int __connman_manager_init(DBusConnection *conn, gboolean compat)
        if (connection == NULL)
                return -1;
 
-       g_dbus_register_object(connection, CONNMAN_MANAGER_PATH, NULL, NULL);
-
        g_dbus_register_interface(connection, CONNMAN_MANAGER_PATH,
-                                               CONNMAN_MANAGER_INTERFACE,
-                                               manager_methods,
-                                               manager_signals, NULL);
+                                       CONNMAN_MANAGER_INTERFACE,
+                                       manager_methods,
+                                       manager_signals, NULL, NULL, NULL);
 
        if (compat == TRUE) {
-               g_dbus_register_object(connection, NM_PATH, NULL, NULL);
-
                g_dbus_register_interface(connection, NM_PATH, NM_INTERFACE,
-                                               nm_methods, NULL, NULL);
+                                       nm_methods, NULL, NULL, NULL, NULL);
 
                nm_compat = TRUE;
        }
@@ -243,14 +239,10 @@ void __connman_manager_cleanup(void)
 
        if (nm_compat == TRUE) {
                g_dbus_unregister_interface(connection, NM_PATH, NM_INTERFACE);
-
-               g_dbus_unregister_object(connection, NM_PATH);
        }
 
        g_dbus_unregister_interface(connection, CONNMAN_MANAGER_PATH,
                                                CONNMAN_MANAGER_INTERFACE);
 
-       g_dbus_unregister_object(connection, CONNMAN_MANAGER_PATH);
-
        dbus_connection_unref(connection);
 }

diff --git a/src/network.c b/src/network.c
index 9da8fea..1264d2d 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -70,7 +70,8 @@ struct connman_network *__connman_iface_find_network(struct connman_iface *iface
 
 int __connman_iface_remove_network(struct connman_iface *iface, const char *path)
 {
-       g_dbus_unregister_object(connection, path);
+       g_dbus_unregister_interface(connection, path,
+                                       CONNMAN_NETWORK_INTERFACE);
 
        return 0;
 }
@@ -157,10 +158,9 @@ const char *__connman_iface_add_network(struct connman_iface *iface,
 
        networks = g_slist_append(networks, network);
 
-       g_dbus_register_object(connection, path, network, network_free);
-
        g_dbus_register_interface(connection, path, CONNMAN_NETWORK_INTERFACE,
-                                               network_methods, NULL, NULL);
+                                               network_methods, NULL, NULL,
+                                                       network, network_free);
 
        return path;
 }