Diff between 30817692564cd0d3545292cbc6d854c8f3643c35 and a7c0fb33281ba9b129003aeea40f67dcbc4be3ac

Changed Files

File Additions Deletions Status
obexd/plugins/syncevolution.c +1 -1 modified
obexd/src/manager.c +6 -0 modified
obexd/src/obexd.h +4 -0 modified

Full Patch

diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c
index 05f5cce..711b5a0 100644
--- a/obexd/plugins/syncevolution.c
+++ b/obexd/plugins/syncevolution.c
@@ -269,7 +269,7 @@ static void synce_connect(obex_t *obex, obex_object_t *obj)
 	struct callback_data *cb_data;
 	struct synce_context *context;
 
-	conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
+	conn = obex_dbus_get_connection();
 	if (!conn)
 		goto failed;
 
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index be0af44..e1778e1 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -1028,4 +1028,10 @@ void unregister_session(guint32 id)
 	g_free(path);
 }
 
+DBusConnection *obex_dbus_get_connection(void)
+{
+	if (connection == NULL)
+		return NULL;
 
+	return dbus_connection_ref(connection);
+}
diff --git a/obexd/src/obexd.h b/obexd/src/obexd.h
index e69872d..94ec795 100644
--- a/obexd/src/obexd.h
+++ b/obexd/src/obexd.h
@@ -21,6 +21,8 @@
  *
  */
 
+#include <dbus/dbus.h>
+
 #define OPENOBEX_SERVICE  "org.openobex"
 
 #define OPENOBEX_MANAGER_PATH		"/"
@@ -34,3 +36,5 @@ void manager_cleanup(void);
 
 gboolean plugin_init(void);
 void plugin_cleanup(void);
+
+DBusConnection *obex_dbus_get_connection(void);