From 5ca10fa88a87d4c22ddb09a75372116bcb067f9b Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Mon, 22 Sep 2008 15:11:44 -0700 Subject: Add Devices property to GetProperties. --- src/adapter.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/adapter.c b/src/adapter.c index 2a4891c6..78990a60 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -1509,6 +1509,9 @@ static DBusMessage *get_properties(DBusConnection *conn, DBusMessageIter dict; char str[249], srcaddr[18]; gboolean discov_active; + char **devices; + int i; + GSList *l; ba2str(&adapter->bdaddr, srcaddr); @@ -1558,6 +1561,16 @@ static DBusMessage *get_properties(DBusConnection *conn, dbus_message_iter_append_dict_entry(&dict, "Discovering", DBUS_TYPE_BOOLEAN, &discov_active); + /* Devices */ + devices = g_new0(char *, g_slist_length(adapter->devices) + 1); + for (i = 0, l = adapter->devices; l; l = l->next, i++) { + struct btd_device *dev = l->data; + devices[i] = (char *) device_get_path(dev); + } + dbus_message_iter_append_dict_entry(&dict, "Devices", + DBUS_TYPE_ARRAY, &devices); + g_free(devices); + dbus_message_iter_close_container(&iter, &dict); return reply; -- cgit