summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-12-05 21:47:21 +0100
committerMarcel Holtmann <marcel@holtmann.org>2008-12-05 21:47:21 +0100
commitfca9b70ed3be7b479c5949bf001d0a071802fca2 (patch)
tree533446063385d24f5e891e86a46f32b23bb00c2a
parentf7afbae29f9cb5a933890e12c16771de5bfd642f (diff)
downloadconnman-fca9b70ed3be7b479c5949bf001d0a071802fca2.tar.gz
connman-fca9b70ed3be7b479c5949bf001d0a071802fca2.tar.bz2
connman-fca9b70ed3be7b479c5949bf001d0a071802fca2.zip
Store the policy setting
-rw-r--r--src/connman.h2
-rw-r--r--src/element.c6
-rw-r--r--src/storage.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/src/connman.h b/src/connman.h
index d7124d2e..82916f15 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 c9fd08a9..0fd230be 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 5e390415..1aeda881 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);