diff options
Diffstat (limited to 'network')
| -rw-r--r-- | network/connection.c | 9 | ||||
| -rw-r--r-- | network/server.c | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/network/connection.c b/network/connection.c index 08766db4..6d6ddd03 100644 --- a/network/connection.c +++ b/network/connection.c @@ -476,18 +476,15 @@ static DBusMessage *connection_get_properties(DBusConnection *conn, } connected = nc ? TRUE : FALSE; - dbus_message_iter_append_dict_entry(&dict, "Connected", - DBUS_TYPE_BOOLEAN, &connected); + dict_append_entry(&dict, "Connected", DBUS_TYPE_BOOLEAN, &connected); /* Device */ property = nc ? nc->dev : ""; - dbus_message_iter_append_dict_entry(&dict, "Device", - DBUS_TYPE_STRING, &property); + dict_append_entry(&dict, "Device", DBUS_TYPE_STRING, &property); /* UUID */ property = nc ? bnep_uuid(nc->id) : ""; - dbus_message_iter_append_dict_entry(&dict, "UUID", - DBUS_TYPE_STRING, &property); + dict_append_entry(&dict, "UUID", DBUS_TYPE_STRING, &property); dbus_message_iter_close_container(&iter, &dict); diff --git a/network/server.c b/network/server.c index 3230fde6..c37fd883 100644 --- a/network/server.c +++ b/network/server.c @@ -736,15 +736,12 @@ static DBusMessage *get_properties(DBusConnection *conn, DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict); - dbus_message_iter_append_dict_entry(&dict, "Name", - DBUS_TYPE_STRING, &ns->name); + dict_append_entry(&dict, "Name", DBUS_TYPE_STRING, &ns->name); uuid = bnep_uuid(ns->id); - dbus_message_iter_append_dict_entry(&dict, "Uuid", - DBUS_TYPE_STRING, &uuid); + dict_append_entry(&dict, "Uuid", DBUS_TYPE_STRING, &uuid); - dbus_message_iter_append_dict_entry(&dict, "Enabled", - DBUS_TYPE_BOOLEAN, &ns->enable); + dict_append_entry(&dict, "Enabled", DBUS_TYPE_BOOLEAN, &ns->enable); dbus_message_iter_close_container(&iter, &dict); |