[RFC v1 14/16] adapter: Remove redundant Devices property
From: Mikel Astiz <hidden>
Date: 2012-11-15 15:09:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Mikel Astiz <redacted> The ObjectManager interface already reports the list of devices, so the the property can be entirely removed. --- doc/adapter-api.txt | 4 ---- src/adapter.c | 30 ------------------------------ 2 files changed, 34 deletions(-)
diff --git a/doc/adapter-api.txt b/doc/adapter-api.txt
index 132e60f..3582793 100644
--- a/doc/adapter-api.txt
+++ b/doc/adapter-api.txt@@ -180,10 +180,6 @@ Properties string Address [readonly] Indicates that a device discovery procedure is active. - array{object} Devices [readonly] - - List of device object paths. - array{string} UUIDs [readonly] List of 128-bit UUIDs that represents the available
diff --git a/src/adapter.c b/src/adapter.c
index aa93785..eb82102 100644
--- a/src/adapter.c
+++ b/src/adapter.c@@ -1018,9 +1018,6 @@ static struct btd_device *adapter_create_device(struct btd_adapter *adapter, adapter->devices = g_slist_append(adapter->devices, device); - g_dbus_emit_property_changed(btd_get_dbus_connection(), - adapter->path, ADAPTER_INTERFACE, "Devices"); - return device; }
@@ -1073,9 +1070,6 @@ void adapter_remove_device(struct btd_adapter *adapter, service_auth_cancel(auth); } - g_dbus_emit_property_changed(btd_get_dbus_connection(), - adapter->path, ADAPTER_INTERFACE, "Devices"); - device_remove(dev, remove_storage); }
@@ -1381,29 +1375,6 @@ static gboolean adapter_property_get_discovering( return TRUE; } -static gboolean adapter_property_get_devices( - const GDBusPropertyTable *property, - DBusMessageIter *iter, void *data) -{ - struct btd_adapter *adapter = data; - DBusMessageIter entry; - GSList *l; - - dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, - DBUS_TYPE_OBJECT_PATH_AS_STRING, &entry); - - for (l = adapter->devices; l != NULL; l = l->next) { - const char *path = device_get_path(l->data); - - dbus_message_iter_append_basic(&entry, DBUS_TYPE_OBJECT_PATH, - &path); - } - - dbus_message_iter_close_container(iter, &entry); - - return TRUE; -} - static gboolean adapter_property_get_uuids(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) {
@@ -1688,7 +1659,6 @@ static const GDBusPropertyTable adapter_properties[] = { { "PairableTimeout", "u", adapter_property_get_pairable_timeout, adapter_property_set_pairable_timeout }, { "Discovering", "b", adapter_property_get_discovering }, - { "Devices", "ao", adapter_property_get_devices }, { "UUIDs", "as", adapter_property_get_uuids }, { } };
--
1.7.11.7