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
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
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;
{ "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 },
{ }
};
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
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;
{ "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 },
{ }
};
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
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
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
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()
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),