From 200219af1dffba22a09cc4110fad24bafdf54e0a Mon Sep 17 00:00:00 2001 From: Patrik Flykt Date: Thu, 22 Dec 2011 15:35:48 +0200 Subject: [PATCH] manager: Remove ConnectedTechnologies and associated function --- src/connman.h | 2 -- src/manager.c | 3 --- src/notifier.c | 21 --------------------- 3 files changed, 26 deletions(-) diff --git a/src/connman.h b/src/connman.h index 88731c1..8667bfa 100644 --- a/src/connman.h +++ b/src/connman.h @@ -566,8 +566,6 @@ void __connman_technology_cleanup(void); int __connman_notifier_init(void); void __connman_notifier_cleanup(void); -void __connman_notifier_list_connected(DBusMessageIter *iter, void *user_data); - void __connman_notifier_register(enum connman_service_type type); void __connman_notifier_unregister(enum connman_service_type type); void __connman_notifier_service_add(struct connman_service *service, diff --git a/src/manager.c b/src/manager.c index 8786a30..11d284d 100644 --- a/src/manager.c +++ b/src/manager.c @@ -63,9 +63,6 @@ static DBusMessage *get_properties(DBusConnection *conn, connman_dbus_dict_append_basic(&dict, "OfflineMode", DBUS_TYPE_BOOLEAN, &offlinemode); - connman_dbus_dict_append_array(&dict, "ConnectedTechnologies", - DBUS_TYPE_STRING, __connman_notifier_list_connected, NULL); - str = __connman_service_default(); if (str != NULL) connman_dbus_dict_append_basic(&dict, "DefaultTechnology", diff --git a/src/notifier.c b/src/notifier.c index e71173b..c1346f2 100644 --- a/src/notifier.c +++ b/src/notifier.c @@ -77,23 +77,6 @@ static volatile int registered[MAX_TECHNOLOGIES]; static volatile int enabled[MAX_TECHNOLOGIES]; static volatile int connected[MAX_TECHNOLOGIES]; -void __connman_notifier_list_connected(DBusMessageIter *iter, void *user_data) -{ - int i; - - __sync_synchronize(); - for (i = 0; i < MAX_TECHNOLOGIES; i++) { - const char *type = __connman_service_type2string(i); - - if (type == NULL) - continue; - - if (connected[i] > 0) - dbus_message_iter_append_basic(iter, - DBUS_TYPE_STRING, &type); - } -} - static void technology_registered(enum connman_service_type type, connman_bool_t registered) { @@ -163,10 +146,6 @@ static void technology_connected(enum connman_service_type type, { DBG("type %d connected %d", type, connected); - connman_dbus_property_changed_array(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "ConnectedTechnologies", - DBUS_TYPE_STRING, __connman_notifier_list_connected, NULL); - state_changed(connected); } -- 2.7.4