From f05865b22811d7a7308f71f34a9971034e4f826b Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Mon, 2 Aug 2010 20:07:33 +0200 Subject: [PATCH] Remove the manager Providers property Providers are regular VPN services, no need to differentiate them anymore. --- src/manager.c | 2 -- src/provider.c | 19 ------------------- 2 files changed, 21 deletions(-) diff --git a/src/manager.c b/src/manager.c index 45dd06a..e9b980b 100644 --- a/src/manager.c +++ b/src/manager.c @@ -58,8 +58,6 @@ static DBusMessage *get_properties(DBusConnection *conn, DBUS_TYPE_OBJECT_PATH, __connman_profile_list, NULL); connman_dbus_dict_append_array(&dict, "Services", DBUS_TYPE_OBJECT_PATH, __connman_service_list, NULL); - connman_dbus_dict_append_array(&dict, "Providers", - DBUS_TYPE_OBJECT_PATH, __connman_provider_list, NULL); connman_dbus_dict_append_array(&dict, "Technologies", DBUS_TYPE_OBJECT_PATH, __connman_technology_list, NULL); diff --git a/src/provider.c b/src/provider.c index 64a2a98..23fccfc 100644 --- a/src/provider.c +++ b/src/provider.c @@ -59,25 +59,6 @@ void __connman_provider_append_properties(struct connman_provider *provider, &provider->type); } -static void append_path(gpointer key, gpointer value, gpointer user_data) -{ - struct connman_provider *provider = value; - DBusMessageIter *iter = user_data; - const char *service_path; - - service_path = __connman_service_get_path(provider->vpn_service); - if (service_path == NULL) - return; - - dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, - &service_path); -} - -void __connman_provider_list(DBusMessageIter *iter, void *user_data) -{ - g_hash_table_foreach(provider_hash, append_path, iter); -} - static struct connman_provider *connman_provider_lookup(const char *identifier) { struct connman_provider *provider = NULL; -- 2.7.4