Diff between 2a14f573bdb2d58a89a284a307b420a441686fcf and 902ba758b0120bac033a9e8d4645ffad9f473ee2

Changed Files

File Additions Deletions Status
obexd/plugins/syncevolution.c +2 -2 modified
obexd/src/dbus.h +1 -1 modified
obexd/src/manager.c +1 -1 modified

Full Patch

diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c
index 7a78669..0644b5a 100644
--- a/obexd/plugins/syncevolution.c
+++ b/obexd/plugins/syncevolution.c
@@ -222,7 +222,7 @@ static void *synce_connect(struct obex_session *os, int *err)
 
 	manager_register_session(os);
 
-	conn = obex_dbus_get_connection();
+	conn = manager_dbus_get_connection();
 	if (!conn)
 		goto failed;
 
@@ -342,7 +342,7 @@ static ssize_t synce_read(void *object, void *buf, size_t count)
 	if (context->buffer)
 		return string_read(context->buffer, buf, count);
 
-	conn = obex_dbus_get_connection();
+	conn = manager_dbus_get_connection();
 	if (conn == NULL)
 		return -EPERM;
 
diff --git a/obexd/src/dbus.h b/obexd/src/dbus.h
index fe736ca..47aecb8 100644
--- a/obexd/src/dbus.h
+++ b/obexd/src/dbus.h
@@ -35,4 +35,4 @@ void manager_emit_transfer_completed(struct obex_session *os);
 int manager_request_authorization(struct obex_session *os, int32_t time,
 		char **new_folder, char **new_name);
 
-DBusConnection *obex_dbus_get_connection(void);
+DBusConnection *manager_dbus_get_connection(void);
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index e162e7f..ceed767 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -655,7 +655,7 @@ void manager_emit_transfer_completed(struct obex_session *os)
 		emit_transfer_completed(os->cid, !os->aborted);
 }
 
-DBusConnection *obex_dbus_get_connection(void)
+DBusConnection *manager_dbus_get_connection(void)
 {
 	if (connection == NULL)
 		return NULL;