From 793f73091affd74135c6235efa7649ef3daf0d3d Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Fri, 21 Dec 2012 12:47:06 +0200
Subject: [PATCH] obexd: Use term active instead of in-progress for transfer
 status

---
 doc/obexd-api.txt       |  2 +-
 obexd/client/transfer.c | 10 +++++-----
 obexd/src/manager.c     | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/obexd-api.txt b/doc/obexd-api.txt
index f43fb122f..dedc34900 100644
--- a/doc/obexd-api.txt
+++ b/doc/obexd-api.txt
@@ -105,7 +105,7 @@ Properties	string Status [readonly]
 
 			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 8cd098a89..2685d7ccf 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
@@ -59,7 +59,7 @@ struct transfer_callback {
 
 enum {
 	TRANSFER_STATUS_QUEUED = 0,
-	TRANSFER_STATUS_IN_PROGRESS,
+	TRANSFER_STATUS_ACTIVE,
 	TRANSFER_STATUS_COMPLETE,
 	TRANSFER_STATUS_ERROR
 };
@@ -280,8 +280,8 @@ static const char *status2str(uint8_t status)
 	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:
@@ -675,8 +675,8 @@ static gboolean report_progress(gpointer data)
 		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 1202bfb10..98b3cbd05 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -64,7 +64,7 @@ struct agent {
 
 enum {
 	TRANSFER_STATUS_QUEUED = 0,
-	TRANSFER_STATUS_IN_PROGRESS,
+	TRANSFER_STATUS_ACTIVE,
 	TRANSFER_STATUS_COMPLETE,
 	TRANSFER_STATUS_ERROR
 };
@@ -324,8 +324,8 @@ static const char *status2str(uint8_t status)
 	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:
@@ -505,7 +505,7 @@ void manager_emit_transfer_started(struct obex_transfer *transfer)
 					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,
@@ -561,7 +561,7 @@ void manager_unregister_transfer(struct obex_transfer *transfer)
 {
 	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,
-- 
2.47.3