diff options
author | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-04-20 13:47:18 +0300 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2012-04-20 13:21:11 +0200 |
commit | 192b4476be18e482f0f1b2f454e1bf542660558c (patch) | |
tree | fe954186a940d2e0d792b49042a71fe8731f9602 | |
parent | 9a7efe890445f2036bffb1c45f6f945d472bada8 (diff) | |
download | connman-192b4476be18e482f0f1b2f454e1bf542660558c.tar.gz connman-192b4476be18e482f0f1b2f454e1bf542660558c.tar.bz2 connman-192b4476be18e482f0f1b2f454e1bf542660558c.zip |
main: Set default values if main.conf is not found
-rw-r--r-- | src/main.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -148,8 +148,11 @@ static void parse_config(GKeyFile *config) "cellular", }; - if (config == NULL) + if (config == NULL) { + connman_settings.auto_connect = + parse_service_types(default_auto_connect, 3); return; + } DBG("parsing main.conf"); @@ -462,10 +465,9 @@ int main(int argc, char *argv[]) __connman_dbus_init(conn); config = load_config(CONFIGDIR "/main.conf"); - if (config != NULL) { - parse_config(config); + parse_config(config); + if (config != NULL) g_key_file_free(config); - } __connman_storage_migrate(); __connman_technology_init(); |