diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/connman.h | 2 | ||||
| -rw-r--r-- | src/device.c | 2 | ||||
| -rw-r--r-- | src/main.c | 12 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/connman.h b/src/connman.h index 379eec0e..76b816b7 100644 --- a/src/connman.h +++ b/src/connman.h @@ -93,7 +93,7 @@ void __connman_debug_list_enabled(DBusMessageIter *iter, void *user_data); #include <connman/option.h> -#include <connman/configuration.h> +#include <connman/setting.h> #include <connman/plugin.h> diff --git a/src/device.c b/src/device.c index 72b86565..ed0eaf28 100644 --- a/src/device.c +++ b/src/device.c @@ -472,7 +472,7 @@ struct connman_device *connman_device_create(const char *node, DBG("device %p", device); - bg_scan = connman_configuration_get_bool("BackgroundScanning"); + bg_scan = connman_setting_get_bool("BackgroundScanning"); __connman_element_initialize(&device->element); @@ -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; } |