From aa215d6fa551a3edbd129d4a163210e98357bdd1 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 8 May 2008 19:39:12 +0000 Subject: Emulate libgdbus API for mainloop integration --- hcid/dbus-common.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'hcid') diff --git a/hcid/dbus-common.c b/hcid/dbus-common.c index 8a8a721a..7aa7b6d1 100644 --- a/hcid/dbus-common.c +++ b/hcid/dbus-common.c @@ -338,11 +338,16 @@ int hcid_dbus_init(void) { DBusConnection *conn; - conn = dbus_bus_system_setup_with_main_loop(BLUEZ_NAME, - disconnect_callback, NULL); + conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, BLUEZ_NAME, NULL); if (!conn) return -1; + if (g_dbus_set_disconnect_function(conn, disconnect_callback, + NULL, NULL) == FALSE) { + dbus_connection_unref(conn); + return -1; + } + if (hcid_dbus_use_experimental()) { debug("Registering experimental manager path"); dbus_connection_create_object_path(conn, "/", NULL, NULL); -- cgit