diff --git a/doc/obexd-api.txt b/doc/obexd-api.txt
index f43fb12..dedc349 100644
--- a/doc/obexd-api.txt
+++ b/doc/obexd-api.txt
Inform the current status of the transfer.
- Possible values: "queued", "in-progress", "complete" or
+ Possible values: "queued", "active", "complete" or
"error"
string Name [readonly]
diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
index 8cd098a..2685d7c 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
enum {
TRANSFER_STATUS_QUEUED = 0,
- TRANSFER_STATUS_IN_PROGRESS,
+ TRANSFER_STATUS_ACTIVE,
TRANSFER_STATUS_COMPLETE,
TRANSFER_STATUS_ERROR
};
switch (status) {
case TRANSFER_STATUS_QUEUED:
return "queued";
- case TRANSFER_STATUS_IN_PROGRESS:
- return "in-progress";
+ case TRANSFER_STATUS_ACTIVE:
+ return "active";
case TRANSFER_STATUS_COMPLETE:
return "complete";
case TRANSFER_STATUS_ERROR:
return FALSE;
}
- if (transfer->status != TRANSFER_STATUS_IN_PROGRESS)
- transfer_set_status(transfer, TRANSFER_STATUS_IN_PROGRESS);
+ if (transfer->status != TRANSFER_STATUS_ACTIVE)
+ transfer_set_status(transfer, TRANSFER_STATUS_ACTIVE);
g_dbus_emit_property_changed(transfer->conn, transfer->path,
TRANSFER_INTERFACE, "Progress");
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index 1202bfb..98b3cbd 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
enum {
TRANSFER_STATUS_QUEUED = 0,
- TRANSFER_STATUS_IN_PROGRESS,
+ TRANSFER_STATUS_ACTIVE,
TRANSFER_STATUS_COMPLETE,
TRANSFER_STATUS_ERROR
};
switch (status) {
case TRANSFER_STATUS_QUEUED:
return "queued";
- case TRANSFER_STATUS_IN_PROGRESS:
- return "in-progress";
+ case TRANSFER_STATUS_ACTIVE:
+ return "active";
case TRANSFER_STATUS_COMPLETE:
return "complete";
case TRANSFER_STATUS_ERROR:
OBEX_BASE_PATH, transfer->session->id,
id++);
- transfer->status = TRANSFER_STATUS_IN_PROGRESS;
+ transfer->status = TRANSFER_STATUS_ACTIVE;
if (!g_dbus_register_interface(connection, transfer->path,
TRANSFER_INTERFACE,
{
struct obex_session *os = transfer->session;
- if (transfer->status == TRANSFER_STATUS_IN_PROGRESS)
+ if (transfer->status == TRANSFER_STATUS_ACTIVE)
emit_transfer_completed(transfer, os->offset == os->size);
g_dbus_unregister_interface(connection, transfer->path,