From fcf438c1615943adff26832b0713c437af41f93f Mon Sep 17 00:00:00 2001 From: Patrik Flykt Date: Thu, 5 Jan 2012 10:14:22 +0200 Subject: [PATCH] manager: Remove manager 'Technologies' property Remove 'Technologies' property from Manager API and the code updating the property. --- src/connman.h | 1 - src/manager.c | 2 -- src/technology.c | 24 ------------------------ 3 files changed, 27 deletions(-) diff --git a/src/connman.h b/src/connman.h index 44da9b0..6f47be6 100644 --- a/src/connman.h +++ b/src/connman.h @@ -309,7 +309,6 @@ void __connman_wispr_stop(struct connman_service *service); #include -void __connman_technology_list(DBusMessageIter *iter, void *user_data); void __connman_technology_list_struct(DBusMessageIter *array); int __connman_technology_add_device(struct connman_device *device); diff --git a/src/manager.c b/src/manager.c index f2fffa9..4db6ab0 100644 --- a/src/manager.c +++ b/src/manager.c @@ -52,8 +52,6 @@ static DBusMessage *get_properties(DBusConnection *conn, connman_dbus_dict_append_array(&dict, "Services", DBUS_TYPE_OBJECT_PATH, __connman_service_list, NULL); - connman_dbus_dict_append_array(&dict, "Technologies", - DBUS_TYPE_OBJECT_PATH, __connman_technology_list, NULL); str = __connman_notifier_get_state(); connman_dbus_dict_append_basic(&dict, "State", diff --git a/src/technology.c b/src/technology.c index 2eac749..b595e93 100644 --- a/src/technology.c +++ b/src/technology.c @@ -240,28 +240,6 @@ static void free_rfkill(gpointer data) g_free(rfkill); } -void __connman_technology_list(DBusMessageIter *iter, void *user_data) -{ - GSList *list; - - for (list = technology_list; list; list = list->next) { - struct connman_technology *technology = list->data; - - if (technology->path == NULL) - continue; - - dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, - &technology->path); - } -} - -static void technologies_changed(void) -{ - connman_dbus_property_changed_array(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "Technologies", - DBUS_TYPE_OBJECT_PATH, __connman_technology_list, NULL); -} - static const char *state2string(enum connman_technology_state state) { switch (state) { @@ -664,7 +642,6 @@ static struct connman_technology *technology_get(enum connman_service_type type) technology_list = g_slist_append(technology_list, technology); - technologies_changed(); technology_added_signal(technology); if (technology->driver != NULL) @@ -704,7 +681,6 @@ static void technology_put(struct connman_technology *technology) technology_list = g_slist_remove(technology_list, technology); - technologies_changed(); technology_removed_signal(technology); g_dbus_unregister_interface(connection, technology->path, -- 2.7.4