From ecbd301c838498597bd628461b1665b330782df5 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Thu, 15 Nov 2012 16:05:21 +0200 Subject: [PATCH] core: Fix registering '/org/bluez' path before '/' This cause problems with ObjectManager being exported in both paths --- src/manager.c | 13 ++++++++----- src/manager.h | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/manager.c b/src/manager.c index 07f948201..3088dd93e 100644 --- a/src/manager.c +++ b/src/manager.c @@ -181,14 +181,17 @@ static const GDBusPropertyTable manager_properties[] = { { } }; -dbus_bool_t manager_init(const char *path) +bool manager_init(const char *path) { - btd_profile_init(); - - return g_dbus_register_interface(btd_get_dbus_connection(), + if (!g_dbus_register_interface(btd_get_dbus_connection(), "/", MANAGER_INTERFACE, manager_methods, manager_signals, - manager_properties, NULL, NULL); + manager_properties, NULL, NULL)) + return false; + + btd_profile_init(); + + return true; } static void manager_set_default_adapter(int id) diff --git a/src/manager.h b/src/manager.h index 0bb8b2cfd..4d094b6f4 100644 --- a/src/manager.h +++ b/src/manager.h @@ -29,7 +29,7 @@ typedef void (*adapter_cb) (struct btd_adapter *adapter, gpointer user_data); -dbus_bool_t manager_init(const char *path); +bool manager_init(const char *path); void manager_cleanup(const char *path); const char *manager_get_base_path(void); -- 2.47.3