Diff between 68d8b41ec2fe653cff82a51c9f95a25d81ae6d50 and cc648c10fea32171ee04a99051087ee26e4b5b22

Changed Files

File Additions Deletions Status
obexd/client/transfer.c +5 -4 modified

Full Patch

diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
index 96ac05f..38993c9 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
@@ -249,7 +249,6 @@ static struct obc_transfer *obc_transfer_register(DBusConnection *conn,
 					const char *filename,
 					const char *name,
 					const char *type,
-					struct obc_transfer_params *params,
 					GError **err)
 {
 	struct obc_transfer *transfer;
@@ -260,7 +259,6 @@ static struct obc_transfer *obc_transfer_register(DBusConnection *conn,
 	transfer->filename = g_strdup(filename);
 	transfer->name = g_strdup(name);
 	transfer->type = g_strdup(type);
-	transfer->params = params;
 
 	/* for OBEX specific mime types we don't need to register a transfer */
 	if (type != NULL &&
@@ -339,7 +337,7 @@ struct obc_transfer *obc_transfer_get(DBusConnection *conn,
 	int perr;
 
 	transfer = obc_transfer_register(conn, agent, G_OBEX_OP_GET, filename,
-						name, type, params, err);
+							name, type, err);
 	if (transfer == NULL)
 		return NULL;
 
@@ -349,6 +347,8 @@ struct obc_transfer *obc_transfer_get(DBusConnection *conn,
 		return NULL;
 	}
 
+	transfer->params = params;
+
 	return transfer;
 }
 
@@ -367,7 +367,7 @@ struct obc_transfer *obc_transfer_put(DBusConnection *conn,
 	int perr;
 
 	transfer = obc_transfer_register(conn, agent, G_OBEX_OP_PUT, filename,
-						name, type, params, err);
+							name, type, err);
 	if (transfer == NULL)
 		return NULL;
 
@@ -401,6 +401,7 @@ struct obc_transfer *obc_transfer_put(DBusConnection *conn,
 	}
 
 	transfer->size = st.st_size;
+	transfer->params = params;
 
 	return transfer;