From 459001327e79a4eeab087da00f634857c221208b Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 18 Dec 2012 21:19:18 +0100
Subject: [PATCH] obexd: Use a single bus name for obexd and obex-client

---
 obexd/client/manager.c | 14 +++++---------
 obexd/src/manager.h    |  2 ++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/obexd/client/manager.c b/obexd/client/manager.c
index 8f367d6f6..806c9e4b8 100644
--- a/obexd/client/manager.c
+++ b/obexd/client/manager.c
@@ -44,8 +44,7 @@
 #include "pbap.h"
 #include "sync.h"
 #include "map.h"
-
-#define CLIENT_SERVICE		"org.bluez.obex.client"
+#include "obexd/src/manager.h"
 
 #define CLIENT_INTERFACE	"org.bluez.obex.Client"
 #define ERROR_INTERFACE		"org.bluez.obex.Error"
@@ -262,15 +261,12 @@ int client_manager_init(void)
 
 	dbus_error_init(&derr);
 
-	conn = g_dbus_setup_bus(DBUS_BUS_SESSION, CLIENT_SERVICE, &derr);
-	if (dbus_error_is_set(&derr) == TRUE) {
-		error("%s: %s", derr.name, derr.message);
-		dbus_error_free(&derr);
+	conn = manager_dbus_get_connection();
+	if (conn == NULL) {
+		error("Can't get client D-Bus connection");
 		return -1;
 	}
 
-	g_dbus_attach_object_manager(conn);
-
 	if (g_dbus_register_interface(conn, CLIENT_PATH, CLIENT_INTERFACE,
 						client_methods, NULL, NULL,
 							NULL, NULL) == FALSE) {
@@ -301,6 +297,6 @@ void client_manager_exit(void)
 		module->exit();
 
 	g_dbus_unregister_interface(conn, CLIENT_PATH, CLIENT_INTERFACE);
-	g_dbus_detach_object_manager(conn);
+
 	dbus_connection_unref(conn);
 }
diff --git a/obexd/src/manager.h b/obexd/src/manager.h
index 99303a265..b0400aa0f 100644
--- a/obexd/src/manager.h
+++ b/obexd/src/manager.h
@@ -25,6 +25,8 @@
 
 #define OBEXD_SERVICE  "org.bluez.obex"
 
+struct obex_session;
+
 void manager_register_session(struct obex_session *os);
 void manager_unregister_session(struct obex_session *os);
 void manager_register_transfer(struct obex_session *os);
-- 
2.47.3