summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2011-04-04 20:49:25 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2011-04-04 20:49:25 +0200
commit335a0fa2e7327dc1adee004673275d296744d385 (patch)
treee095b8605ba950b8cbd5fb7bb469216f83417896 /src/main.c
parent686b3102882d10a497fe5d22fd936b869a7ef71e (diff)
downloadconnman-335a0fa2e7327dc1adee004673275d296744d385.tar.gz
connman-335a0fa2e7327dc1adee004673275d296744d385.tar.bz2
connman-335a0fa2e7327dc1adee004673275d296744d385.zip
configuration: Rename configuration to setting
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c
index 9f7c7d2d..18b6bc3c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -40,11 +40,9 @@
#include "connman.h"
-struct connman_conf {
+static struct {
connman_bool_t bg_scan;
-};
-
-static struct connman_conf main_conf = {
+} connman_settings = {
.bg_scan = TRUE,
};
@@ -80,7 +78,7 @@ static void parse_config(GKeyFile *config)
boolean = g_key_file_get_boolean(config, "General",
"BackgroundScanning", &error);
if (error == NULL)
- main_conf.bg_scan = boolean;
+ connman_settings.bg_scan = boolean;
g_clear_error(&error);
}
@@ -162,10 +160,10 @@ const char *connman_option_get_string(const char *key)
return NULL;
}
-connman_bool_t connman_configuration_get_bool(const char *key)
+connman_bool_t connman_setting_get_bool(const char *key)
{
if (g_str_equal(key, "BackgroundScanning") == TRUE)
- return main_conf.bg_scan;
+ return connman_settings.bg_scan;
return FALSE;
}