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) {
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);
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;
}
}
g_dbus_unregister_interface(conn, iface->path,
CONNMAN_IFACE_INTERFACE);
-
- g_dbus_unregister_object_hierarchy(conn, iface->path);
}
g_slist_free(interfaces);
}
static GDBusMethodTable nm_methods[] = {
- { "sleep", "", "", nm_sleep },
- { "wake", "", "", nm_wake },
- { "state", "", "u", nm_state },
+ { "sleep", "", "", nm_sleep },
+ { "wake", "", "", nm_wake },
+ { "state", "", "u", nm_state },
{ },
};
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;
}
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);
}
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;
}
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;
}