Diff between 793f73091affd74135c6235efa7649ef3daf0d3d and da068075ce750eb299906fcb6f4f7115222b87c6

Changed Files

File Additions Deletions Status
doc/obexd-api.txt +1 -1 modified
obexd/client/transfer.c +5 -4 modified
obexd/src/manager.c +3 -3 modified
test/ftp-client +4 -4 modified
test/opp-client +4 -4 modified

Full Patch

diff --git a/doc/obexd-api.txt b/doc/obexd-api.txt
index dedc349..5ec8e01 100644
--- a/doc/obexd-api.txt
+++ b/doc/obexd-api.txt
@@ -121,7 +121,7 @@ Properties	string Status [readonly]
 
 			Complete name of the file being received or sent.
 
-		uint64 Progress [readonly, optional]
+		uint64 Transferred [readonly, optional]
 
 			Number of bytes transferred. For queued transfers, this
 			value will not be present.
diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
index 2685d7c..5c652c0 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
@@ -254,14 +254,15 @@ static gboolean get_filename(const GDBusPropertyTable *property,
 	return TRUE;
 }
 
-static gboolean progress_exists(const GDBusPropertyTable *property, void *data)
+static gboolean transferred_exists(const GDBusPropertyTable *property,
+								void *data)
 {
 	struct obc_transfer *transfer = data;
 
 	return transfer->obex != NULL;
 }
 
-static gboolean get_progress(const GDBusPropertyTable *property,
+static gboolean get_transferred(const GDBusPropertyTable *property,
 					DBusMessageIter *iter, void *data)
 {
 	struct obc_transfer *transfer = data;
@@ -311,7 +312,7 @@ static const GDBusPropertyTable obc_transfer_properties[] = {
 	{ "Name", "s", get_name, NULL, name_exists },
 	{ "Size", "t", get_size },
 	{ "Filename", "s", get_filename, NULL, filename_exists },
-	{ "Progress", "t", get_progress, NULL, progress_exists },
+	{ "Transferred", "t", get_transferred, NULL, transferred_exists },
 	{ }
 };
 
@@ -679,7 +680,7 @@ static gboolean report_progress(gpointer data)
 		transfer_set_status(transfer, TRANSFER_STATUS_ACTIVE);
 
 	g_dbus_emit_property_changed(transfer->conn, transfer->path,
-					TRANSFER_INTERFACE, "Progress");
+					TRANSFER_INTERFACE, "Transferred");
 
 	return TRUE;
 }
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index 98b3cbd..1b612e5 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -413,7 +413,7 @@ static gboolean transfer_get_filename(const GDBusPropertyTable *property,
 	return TRUE;
 }
 
-static gboolean transfer_get_progress(const GDBusPropertyTable *property,
+static gboolean transfer_get_transferred(const GDBusPropertyTable *property,
 					DBusMessageIter *iter, void *data)
 {
 	struct obex_transfer *transfer = data;
@@ -444,7 +444,7 @@ static const GDBusPropertyTable transfer_properties[] = {
 	{ "Size", "t", transfer_get_size, NULL, transfer_size_exists },
 	{ "Filename", "s", transfer_get_filename, NULL,
 						transfer_filename_exists },
-	{ "Progress", "t", transfer_get_progress },
+	{ "Transferred", "t", transfer_get_transferred },
 	{ }
 };
 
@@ -537,7 +537,7 @@ static void emit_transfer_progress(struct obex_transfer *transfer,
 		return;
 
 	g_dbus_emit_property_changed(connection, transfer->path,
-					TRANSFER_INTERFACE, "Progress");
+					TRANSFER_INTERFACE, "Transferred");
 }
 
 static void transfer_free(struct obex_transfer *transfer)
diff --git a/test/ftp-client b/test/ftp-client
index 295b7b0..1049197 100755
--- a/test/ftp-client
+++ b/test/ftp-client
@@ -42,7 +42,7 @@ def parse_options():
 
 class FtpClient:
 	def __init__(self, session_path, verbose=False):
-		self.progress = 0
+		self.transferred = 0
 		self.transfer_path = None
 		self.transfer_size = 0
 		self.verbose = verbose
@@ -80,14 +80,14 @@ class FtpClient:
 			mainloop.quit()
 			return
 
-		if properties["Progress"] == None:
+		if properties["Transferred"] == None:
 			return
 
-		speed = (value - self.progress) / 1000
+		speed = (value - self.transferred) / 1000
 		print "Transfer progress %d/%d at %d kBps" % (value,
 							self.transfer_size,
 							speed)
-		self.progress = value
+		self.transferred = value
 
 	def change_folder(self, new_dir):
 		for node in new_dir.split("/"):
diff --git a/test/opp-client b/test/opp-client
index f346bb6..c58f7c2 100755
--- a/test/opp-client
+++ b/test/opp-client
@@ -28,7 +28,7 @@ def parse_options():
 
 class OppClient:
 	def __init__(self, session_path, verbose=False):
-		self.progress = 0
+		self.transferred = 0
 		self.transfer_path = None
 		self.verbose = verbose
 		bus = dbus.SessionBus()
@@ -61,14 +61,14 @@ class OppClient:
 			mainloop.quit()
 			return
 
-		if properties["Progress"] == None:
+		if properties["Transferred"] == None:
 			return
 
-		speed = (value - self.progress) / 1000
+		speed = (value - self.transferred) / 1000
 		print "Transfer progress %d/%d at %d kBps" % (value,
 							self.transfer_size,
 							speed)
-		self.progress = value
+		self.transferred = value
 
 	def pull_business_card(self, filename):
 		self.opp.PullBusinessCard(os.path.abspath(filename),