From d3b779a77a8520c8e008d220322883f389212384 Mon Sep 17 00:00:00 2001 From: Mikel Astiz Date: Mon, 4 Jun 2012 11:37:47 +0200 Subject: obexd: Expose D-Bus data in internal transfer API Expose in transfer API the D-Bus path and properties as should be returned by transfer-initiating D-Bus methods. --- obexd/client/transfer.c | 64 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 13 deletions(-) (limited to 'obexd/client/transfer.c') diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c index e6ca72d75..4963665cb 100644 --- a/obexd/client/transfer.c +++ b/obexd/client/transfer.c @@ -84,6 +84,21 @@ static GQuark obc_transfer_error_quark(void) return g_quark_from_static_string("obc-transfer-error-quark"); } +static void obc_transfer_append_dbus_properties(struct obc_transfer *transfer, + DBusMessageIter *dict) +{ + obex_dbus_dict_append(dict, "Name", DBUS_TYPE_STRING, &transfer->name); + obex_dbus_dict_append(dict, "Size", DBUS_TYPE_UINT64, &transfer->size); + + if (transfer->filename != NULL) + obex_dbus_dict_append(dict, "Filename", DBUS_TYPE_STRING, + &transfer->filename); + + if (transfer->obex != NULL) + obex_dbus_dict_append(dict, "Progress", DBUS_TYPE_UINT64, + &transfer->progress); +} + static DBusMessage *obc_transfer_get_properties(DBusConnection *connection, DBusMessage *message, void *user_data) { @@ -96,24 +111,47 @@ static DBusMessage *obc_transfer_get_properties(DBusConnection *connection, return NULL; dbus_message_iter_init_append(reply, &iter); - dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, - DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING - DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING - DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict); + OBC_PROPERTIES_ARRAY_SIGNATURE, + &dict); - obex_dbus_dict_append(&dict, "Name", DBUS_TYPE_STRING, &transfer->name); - obex_dbus_dict_append(&dict, "Size", DBUS_TYPE_UINT64, &transfer->size); + obc_transfer_append_dbus_properties(transfer, &dict); - if (transfer->filename != NULL) - obex_dbus_dict_append(&dict, "Filename", DBUS_TYPE_STRING, - &transfer->filename); + dbus_message_iter_close_container(&iter, &dict); - if (transfer->obex != NULL) - obex_dbus_dict_append(&dict, "Progress", DBUS_TYPE_UINT64, - &transfer->progress); + return reply; +} - dbus_message_iter_close_container(&iter, &dict); +static void obc_transfer_append_dbus_data(struct obc_transfer *transfer, + DBusMessageIter *iter) +{ + const char *path = transfer->path; + DBusMessageIter entry, dict; + + dbus_message_iter_open_container(iter, DBUS_TYPE_STRUCT, NULL, &entry); + dbus_message_iter_append_basic(&entry, DBUS_TYPE_OBJECT_PATH, &path); + dbus_message_iter_open_container(&entry, DBUS_TYPE_ARRAY, + OBC_PROPERTIES_ARRAY_SIGNATURE, + &dict); + + obc_transfer_append_dbus_properties(transfer, &dict); + + dbus_message_iter_close_container(&entry, &dict); + dbus_message_iter_close_container(iter, &entry); +} + +DBusMessage *obc_transfer_create_dbus_reply(struct obc_transfer *transfer, + DBusMessage *message) +{ + DBusMessage *reply; + DBusMessageIter iter; + + reply = dbus_message_new_method_return(message); + if (reply == NULL) + return NULL; + + dbus_message_iter_init_append(reply, &iter); + obc_transfer_append_dbus_data(transfer, &iter); return reply; } -- cgit v1.2.1