projects
/
profile
/
ivi
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9a7efe8
)
main: Set default values if main.conf is not found
author
Patrik Flykt
<patrik.flykt@linux.intel.com>
Fri, 20 Apr 2012 10:47:18 +0000
(13:47 +0300)
committer
Marcel Holtmann
<marcel@holtmann.org>
Fri, 20 Apr 2012 11:21:11 +0000
(13:21 +0200)
src/main.c
patch
|
blob
|
history
diff --git
a/src/main.c
b/src/main.c
index
61e35cb
..
c0e87b3
100644
(file)
--- 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();