diff options
| author | ERAMOTO Masaya <eramoto.masaya@jp.fujitsu.com> | 2018-03-01 13:27:10 +0900 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2018-03-01 10:49:05 +0200 |
| commit | 2bb5392474b0adfea6dd278ec4c6634f66674d49 (patch) | |
| tree | 8d51962d6fecacf6bf00ab0fb8f2623eec195ef6 /obexd/client | |
| parent | abcffedf079b34e871bf00fba9e3e2e111d4df30 (diff) | |
| download | bluez-2bb5392474b0adfea6dd278ec4c6634f66674d49.tar.gz | |
obexd: Use g_dbus_dict_append_entry()
Diffstat (limited to 'obexd/client')
| -rw-r--r-- | obexd/client/ftp.c | 6 | ||||
| -rw-r--r-- | obexd/client/map.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/obexd/client/ftp.c b/obexd/client/ftp.c index 3628657d3..f4923b304 100644 --- a/obexd/client/ftp.c +++ b/obexd/client/ftp.c @@ -115,7 +115,7 @@ static void xml_element(GMarkupParseContext *ctxt, DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict); - obex_dbus_dict_append(&dict, "Type", DBUS_TYPE_STRING, &element); + g_dbus_dict_append_entry(&dict, "Type", DBUS_TYPE_STRING, &element); /* FIXME: User, Group, Other permission must be reviewed */ @@ -125,10 +125,10 @@ static void xml_element(GMarkupParseContext *ctxt, if (g_str_equal("Size", key) == TRUE) { guint64 size; size = g_ascii_strtoll(values[i], NULL, 10); - obex_dbus_dict_append(&dict, key, DBUS_TYPE_UINT64, + g_dbus_dict_append_entry(&dict, key, DBUS_TYPE_UINT64, &size); } else - obex_dbus_dict_append(&dict, key, DBUS_TYPE_STRING, + g_dbus_dict_append_entry(&dict, key, DBUS_TYPE_STRING, &values[i]); } diff --git a/obexd/client/map.c b/obexd/client/map.c index 4c6d67629..d1c897677 100644 --- a/obexd/client/map.c +++ b/obexd/client/map.c @@ -231,8 +231,9 @@ static void folder_element(GMarkupParseContext *ctxt, const char *element, for (i = 0, key = names[i]; key; key = names[++i]) { if (strcasecmp("name", key) == 0) - obex_dbus_dict_append(&dict, "Name", DBUS_TYPE_STRING, - &values[i]); + g_dbus_dict_append_entry(&dict, "Name", + DBUS_TYPE_STRING, + &values[i]); } dbus_message_iter_close_container(iter, &dict); |