summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorPatrik Flykt <patrik.flykt@linux.intel.com>2012-04-20 13:47:18 +0300
committerMarcel Holtmann <marcel@holtmann.org>2012-04-20 13:21:11 +0200
commit192b4476be18e482f0f1b2f454e1bf542660558c (patch)
treefe954186a940d2e0d792b49042a71fe8731f9602 /src/main.c
parent9a7efe890445f2036bffb1c45f6f945d472bada8 (diff)
downloadconnman-192b4476be18e482f0f1b2f454e1bf542660558c.tar.gz
connman-192b4476be18e482f0f1b2f454e1bf542660558c.tar.bz2
connman-192b4476be18e482f0f1b2f454e1bf542660558c.zip
main: Set default values if main.conf is not found
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 61e35cb3..c0e87b3a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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();