Diff between 7fee9ce693d6733e0601a087fa8661b6a4fe917c and 10dfec83a1c75301ca8db826cdfecb7360e05318

Changed Files

File Additions Deletions Status
gobex/gobex-transfer.c +1 -1 modified
gobex/gobex-transfer.h +1 -1 modified
tools/obex-client-tool.c +2 -1 modified

Full Patch

diff --git a/gobex/gobex-transfer.c b/gobex/gobex-transfer.c
index c7b20b3..d65d016 100644
--- a/gobex/gobex-transfer.c
+++ b/gobex/gobex-transfer.c
@@ -146,7 +146,7 @@ static struct transfer *transfer_new(GObex *obex, guint8 opcode,
 	return transfer;
 }
 
-guint g_obex_put(GObex *obex, const char *type, const char *name,
+guint g_obex_put_req(GObex *obex, const char *type, const char *name,
 			GObexDataProducer data_func,
 			GObexFunc complete_func, gpointer user_data,
 			GError **err)
diff --git a/gobex/gobex-transfer.h b/gobex/gobex-transfer.h
index 6676bce..040d0e7 100644
--- a/gobex/gobex-transfer.h
+++ b/gobex/gobex-transfer.h
@@ -27,7 +27,7 @@
 #include <gobex/gobex.h>
 #include <gobex/gobex-defs.h>
 
-guint g_obex_put(GObex *obex, const char *type, const char *name,
+guint g_obex_put_req(GObex *obex, const char *type, const char *name,
 			GObexDataProducer data_func, GObexFunc complete_func,
 			gpointer user_data, GError **err);
 
diff --git a/tools/obex-client-tool.c b/tools/obex-client-tool.c
index 6664727..ea3e904 100644
--- a/tools/obex-client-tool.c
+++ b/tools/obex-client-tool.c
@@ -159,7 +159,8 @@ static void cmd_put(int argc, char **argv)
 	data = g_new0(struct put_data, 1);
 	data->fd = fd;
 
-	g_obex_put(obex, NULL, argv[1], put_data_cb, put_complete, data, &err);
+	g_obex_put_req(obex, NULL, argv[1], put_data_cb, put_complete, data,
+									&err);
 	if (err != NULL) {
 		g_printerr("put failed: %s\n", err->message);
 		g_error_free(err);