From b17fa688a35b0bac832c937508cb76b32f7b1ead Mon Sep 17 00:00:00 2001 From: ERAMOTO Masaya Date: Fri, 9 Feb 2018 18:10:57 +0900 Subject: [PATCH] obexd: Use emitting function wrapped for transfer Also replaces emit_transfer_progress() with the new wrapper function because the total/transferred arguments have not been used since commit a5c2b6e8 ("obexd: Align client and server spec of org.bluez.obex.Transfer1") and g_dbus_emit_property_changed_full() checks if the path argument is NULL. Change-Id: I2733ee5de2de15d008d45724abffafefa87fc045 Signed-off-by: Amit Purwar --- obexd/src/manager.c | 29 +++++++++++++---------------- obexd/src/manager.h | 2 ++ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/obexd/src/manager.c b/obexd/src/manager.c index 54ee075..2b620a8 100755 --- a/obexd/src/manager.c +++ b/obexd/src/manager.c @@ -666,12 +666,21 @@ void manager_cleanup(void) dbus_connection_unref(connection); } +void manager_emit_transfer_property(struct obex_transfer *transfer, + char *name) +{ + if (!transfer->path) + return; + + g_dbus_emit_property_changed(connection, transfer->path, + TRANSFER_INTERFACE, name); +} + void manager_emit_transfer_started(struct obex_transfer *transfer) { transfer->status = TRANSFER_STATUS_ACTIVE; - g_dbus_emit_property_changed(connection, transfer->path, - TRANSFER_INTERFACE, "Status"); + manager_emit_transfer_property(transfer, "Status"); } static void emit_transfer_completed(struct obex_transfer *transfer, @@ -683,18 +692,7 @@ static void emit_transfer_completed(struct obex_transfer *transfer, transfer->status = success ? TRANSFER_STATUS_COMPLETE : TRANSFER_STATUS_ERROR; - g_dbus_emit_property_changed(connection, transfer->path, - TRANSFER_INTERFACE, "Status"); -} - -static void emit_transfer_progress(struct obex_transfer *transfer, - uint32_t total, uint32_t transferred) -{ - if (transfer->path == NULL) - return; - - g_dbus_emit_property_changed(connection, transfer->path, - TRANSFER_INTERFACE, "Transferred"); + manager_emit_transfer_property(transfer, "Status"); } static void transfer_free(struct obex_transfer *transfer) @@ -916,8 +914,7 @@ void manager_unregister_session(struct obex_session *os) void manager_emit_transfer_progress(struct obex_transfer *transfer) { - emit_transfer_progress(transfer, transfer->session->size, - transfer->session->offset); + manager_emit_transfer_property(transfer, "Transferred"); } void manager_emit_transfer_completed(struct obex_transfer *transfer) diff --git a/obexd/src/manager.h b/obexd/src/manager.h index d9781b2..d709af5 100755 --- a/obexd/src/manager.h +++ b/obexd/src/manager.h @@ -33,6 +33,8 @@ void manager_unregister_session(struct obex_session *os); struct obex_transfer *manager_register_transfer(struct obex_session *os); void manager_unregister_transfer(struct obex_transfer *transfer); +void manager_emit_transfer_property(struct obex_transfer *transfer, + char *name); void manager_emit_transfer_started(struct obex_transfer *transfer); void manager_emit_transfer_progress(struct obex_transfer *transfer); void manager_emit_transfer_completed(struct obex_transfer *transfer); -- 2.7.4