aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeber <beber>2005-12-02 18:22:03 +0000
committerbeber <beber>2005-12-02 18:22:03 +0000
commit0eb6b4ec31a79185b1dc855d2c0cb4ef67b4631a (patch)
tree07282784b3d6b03023bc526e218f5fb1df066a16
parentuser right nick (diff)
downloadespik-0eb6b4ec31a79185b1dc855d2c0cb4ef67b4631a.tar.xz
if ecore_config_load failed, swithch to use default config
-rw-r--r--src/espik_config.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/espik_config.c b/src/espik_config.c
index c770b54..d8b2125 100644
--- a/src/espik_config.c
+++ b/src/espik_config.c
@@ -70,13 +70,17 @@ void espik_config_init ()
/* exit (ret); */
}
-/* if ((ret = ecore_config_load ()) != ECORE_CONFIG_ERR_SUCC)
+ if ((ret = ecore_config_load ()) != ECORE_CONFIG_ERR_SUCC)
{
fprintf (stderr, "espik_config_init: Load ecore_config failed (%d)\n", ret);
kill_me (2);
// exit (ret);
}
-*/
+ else
+ {
+ /* If an config option is not present, this will force it to a value */
+ espik_config_default_set ();
+ }
}
void espik_config_get (t_info *s_info)
@@ -84,9 +88,6 @@ void espik_config_get (t_info *s_info)
s_info->server = malloc (sizeof (t_servinfo));
s_info->client = malloc (sizeof (t_userinfo));
- /* If an config option is not present, this will force it to a value */
- espik_config_default_set ();
-
s_info->server->host = ecore_config_string_get ("/config/server/0/host");
s_info->server->port = (unsigned short)ecore_config_int_get ("/config/server/0/port");