summaryrefslogtreecommitdiffstats
path: root/hcid
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-05-08 19:39:12 +0000
committerMarcel Holtmann <marcel@holtmann.org>2008-05-08 19:39:12 +0000
commitaa215d6fa551a3edbd129d4a163210e98357bdd1 (patch)
treed117772b0b444240eac624427393e9dff4d92703 /hcid
parent33191e6275ab82aa4161cdf75b45597e4d1568ec (diff)
Emulate libgdbus API for mainloop integration
Diffstat (limited to 'hcid')
-rw-r--r--hcid/dbus-common.c9
1 files changed, 7 insertions, 2 deletions
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);