From fca9b70ed3be7b479c5949bf001d0a071802fca2 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 5 Dec 2008 21:47:21 +0100 Subject: [PATCH] Store the policy setting --- src/connman.h | 2 ++ src/element.c | 6 +++--- src/storage.c | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/connman.h b/src/connman.h index d7124d2..82916f1 100644 --- a/src/connman.h +++ b/src/connman.h @@ -79,6 +79,8 @@ int __connman_element_count(enum connman_element_type type); const char *__connman_element_type2string(enum connman_element_type type); const char *__connman_element_subtype2string(enum connman_element_subtype type); +const char *__connman_element_policy2string(enum connman_element_policy policy); + int __connman_element_load(struct connman_element *element); int __connman_element_store(struct connman_element *element); diff --git a/src/element.c b/src/element.c index c9fd08a..0fd230b 100644 --- a/src/element.c +++ b/src/element.c @@ -148,7 +148,7 @@ static const char *subtype2string(enum connman_element_subtype type) return NULL; } -static const char *policy2string(enum connman_element_policy policy) +const char *__connman_element_policy2string(enum connman_element_policy policy) { switch (policy) { case CONNMAN_ELEMENT_POLICY_UNKNOWN: @@ -392,7 +392,7 @@ static DBusMessage *get_device_properties(DBusConnection *conn, connman_dbus_dict_append_variant(&dict, "Type", DBUS_TYPE_STRING, &str); - str = policy2string(element->policy); + str = __connman_element_policy2string(element->policy); if (str != NULL) connman_dbus_dict_append_variant(&dict, "Policy", DBUS_TYPE_STRING, &str); @@ -467,7 +467,7 @@ static DBusMessage *get_network_properties(DBusConnection *conn, DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict); - str = policy2string(element->policy); + str = __connman_element_policy2string(element->policy); if (str != NULL) connman_dbus_dict_append_variant(&dict, "Policy", DBUS_TYPE_STRING, &str); diff --git a/src/storage.c b/src/storage.c index 5e39041..1aeda88 100644 --- a/src/storage.c +++ b/src/storage.c @@ -103,6 +103,10 @@ static void do_update(GKeyFile *keyfile, struct connman_element *element) g_key_file_set_string(keyfile, element->path, "Name", element->name); + value = __connman_element_policy2string(element->policy); + if (value != NULL) + g_key_file_set_string(keyfile, element->path, "Policy", value); + g_key_file_set_boolean(keyfile, element->path, "Enabled", element->enabled); -- 2.7.4