Diff between dc3076af72a0b1665143795d954e9d97582a5b35 and 8a296cfcbb4de31ab709af9d91fd27f34ebff896

Changed Files

File Additions Deletions Status
obexd/client/session.c +2 -2 modified
obexd/client/transfer.c +2 -3 modified
obexd/client/transfer.h +1 -0 modified

Full Patch

diff --git a/obexd/client/session.c b/obexd/client/session.c
index 7014396..7f88a6a 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -656,8 +656,8 @@ guint obc_session_queue(struct obc_session *session,
 		return 0;
 	}
 
-	if (!obc_transfer_register(transfer, session->conn, session->owner,
-									err)) {
+	if (!obc_transfer_register(transfer, session->conn, session->path,
+							session->owner, err)) {
 		obc_transfer_unregister(transfer);
 		return 0;
 	}
diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
index be61f40..1e7cb46 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
@@ -44,7 +44,6 @@
 #include "transfer.h"
 
 #define TRANSFER_INTERFACE "org.bluez.obex.Transfer"
-#define TRANSFER_BASEPATH "/org/bluez/obex"
 
 #define OBC_TRANSFER_ERROR obc_transfer_error_quark()
 
@@ -301,13 +300,13 @@ static struct obc_transfer *obc_transfer_create(guint8 op,
 
 gboolean obc_transfer_register(struct obc_transfer *transfer,
 						DBusConnection *conn,
+						const char *path,
 						const char *owner,
 						GError **err)
 {
 	transfer->owner = g_strdup(owner);
 
-	transfer->path = g_strdup_printf("%s/transfer%ju",
-			TRANSFER_BASEPATH, counter++);
+	transfer->path = g_strdup_printf("%s/transfer%ju", path, counter++);
 
 	transfer->conn = dbus_connection_ref(conn);
 	if (transfer->conn == NULL) {
diff --git a/obexd/client/transfer.h b/obexd/client/transfer.h
index 071b6d3..968903a 100644
--- a/obexd/client/transfer.h
+++ b/obexd/client/transfer.h
@@ -36,6 +36,7 @@ struct obc_transfer *obc_transfer_put(const char *type, const char *name,
 
 gboolean obc_transfer_register(struct obc_transfer *transfer,
 					DBusConnection *conn,
+					const char *path,
 					const char *owner,
 					GError **err);