korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-02 16:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

obex-client: Make use of g_dbus_get_properties to get transfer properties

Browse Source 
In addition fix the reply generated by obc_transfer_create_dbus_reply to
not use a structure container instead use object, dict 'oa{sv}' as
indicated in the documentation.
This commit is contained in:
Luiz Augusto von Dentz 2012-12-17 15:25:26 +02:00 committed by Johan Hedberg
parent 88de7b0530
commit 3eadc034c9
1 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
obexd/client/transfer.c
View File

@ -97,47 +97,6 @@ static void obc_transfer_append_dbus_properties(struct obc_transfer *transfer,
&transfer->progress);
}
static DBusMessage *obc_transfer_get_properties(DBusConnection *connection,
DBusMessage *message, void *user_data)
{
struct obc_transfer *transfer = user_data;
DBusMessage *reply;
DBusMessageIter iter, dict;
reply = dbus_message_new_method_return(message);
if (!reply)
return NULL;
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
OBC_PROPERTIES_ARRAY_SIGNATURE,
&dict);
obc_transfer_append_dbus_properties(transfer, &dict);
dbus_message_iter_close_container(&iter, &dict);
return reply;
}
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)
{
@ -149,7 +108,10 @@ DBusMessage *obc_transfer_create_dbus_reply(struct obc_transfer *transfer,
return NULL;
dbus_message_iter_init_append(reply, &iter);
obc_transfer_append_dbus_data(transfer, &iter);
dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
&transfer->path);
g_dbus_get_properties(transfer->conn, transfer->path,
TRANSFER_INTERFACE, &iter);
return reply;
}