equal
deleted
inserted
replaced
32 #include <sys/wait.h> |
32 #include <sys/wait.h> |
33 #include <glib.h> |
33 #include <glib.h> |
34 |
34 |
35 #include "jabglue.h" |
35 #include "jabglue.h" |
36 #include "screen.h" |
36 #include "screen.h" |
37 #include "parsecfg.h" |
|
38 #include "settings.h" |
37 #include "settings.h" |
39 #include "roster.h" |
38 #include "roster.h" |
40 #include "commands.h" |
39 #include "commands.h" |
41 #include "histolog.h" |
40 #include "histolog.h" |
42 #include "hooks.h" |
41 #include "hooks.h" |
215 if (configFile) |
214 if (configFile) |
216 ut_WriteLog("Setting config file: %s\n", configFile); |
215 ut_WriteLog("Setting config file: %s\n", configFile); |
217 |
216 |
218 /* Parsing config file... */ |
217 /* Parsing config file... */ |
219 ut_WriteLog("Parsing config file...\n"); |
218 ut_WriteLog("Parsing config file...\n"); |
220 ret = cfg_file(configFile); |
219 ret = cfg_read_file(configFile); |
221 if (configFile) g_free(configFile); |
220 if (configFile) g_free(configFile); |
222 /* Leave if there was an error in the config. file */ |
221 /* Leave if there was an error in the config. file */ |
223 if (ret) |
222 if (ret) |
224 exit(EXIT_FAILURE); |
223 exit(EXIT_FAILURE); |
225 |
224 |