summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2008-11-29 22:04:26 +0200
committerJohan Hedberg <johan.hedberg@nokia.com>2008-11-29 22:04:26 +0200
commit5469f8c61d9ad52a6c0696daf00ef5375aee1883 (patch)
tree3e7ab945df25a8c3428bef9c46833ad73a1821b1
parente96edbf1d36d33e55087d4f47342fbc5af95773a (diff)
Make adapter_update_devices private to adapter.c
-rw-r--r--src/adapter.c38
-rw-r--r--src/adapter.h1
2 files changed, 19 insertions, 20 deletions
diff --git a/src/adapter.c b/src/adapter.c
index 6797820d..1c99801b 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1164,6 +1164,25 @@ struct btd_device *adapter_find_device(struct btd_adapter *adapter, const char *
return device;
}
+static void adapter_update_devices(struct btd_adapter *adapter)
+{
+ char **devices;
+ int i;
+ GSList *l;
+
+ /* 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);
+ }
+
+ emit_array_property_changed(connection, adapter->path,
+ ADAPTER_INTERFACE, "Devices",
+ DBUS_TYPE_OBJECT_PATH, &devices);
+ g_free(devices);
+}
+
struct btd_device *adapter_create_device(DBusConnection *conn,
struct btd_adapter *adapter, const char *address)
{
@@ -3498,25 +3517,6 @@ int btd_cancel_authorization(const bdaddr_t *src, const bdaddr_t *dst)
return agent_cancel(agent);
}
-void adapter_update_devices(struct btd_adapter *adapter)
-{
- char **devices;
- int i;
- GSList *l;
-
- /* 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);
- }
-
- emit_array_property_changed(connection, adapter->path,
- ADAPTER_INTERFACE, "Devices",
- DBUS_TYPE_OBJECT_PATH, &devices);
- g_free(devices);
-}
-
static gchar *adapter_any_path = NULL;
static int adapter_any_refcount = 0;
diff --git a/src/adapter.h b/src/adapter.h
index 2fc22ca5..fdea2aeb 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -151,7 +151,6 @@ void adapter_add_active_conn(struct btd_adapter *adapter, bdaddr_t *bdaddr,
uint16_t handle);
void adapter_remove_active_conn(struct btd_adapter *adapter,
struct active_conn_info *dev);
-void adapter_update_devices(struct btd_adapter *adapter);
struct active_conn_info *adapter_search_active_conn_by_bdaddr(struct btd_adapter *adapter,
bdaddr_t *bda);
struct active_conn_info *adapter_search_active_conn_by_handle(struct btd_adapter *adapter,