only load the system rc if the user rc didnt load

This commit is contained in:
Dana Jansens 2003-03-22 22:51:27 +00:00
parent 9f68b12062
commit 4cc0d9b72d

View file

@ -44,22 +44,26 @@ void config_parse()
{
FILE *file;
char *path;
gboolean load = FALSE;
/* load the system wide rc file first */
path = g_build_filename(RCDIR, "rc3", NULL);
if ((file = fopen(path, "r")) != NULL) {
cparse_go(path, file);
fclose(file);
}
g_free(path);
/* then load the user one which can override it */
/* load the user rc */
path = g_build_filename(g_get_home_dir(), ".openbox", "rc3", NULL);
if ((file = fopen(path, "r")) != NULL) {
cparse_go(path, file);
fclose(file);
load = TRUE;
}
g_free(path);
g_free(path);
if (!load) {
/* load the system wide rc */
path = g_build_filename(RCDIR, "rc3", NULL);
if ((file = fopen(path, "r")) != NULL) {
cparse_go(path, file);
fclose(file);
}
}
}
gboolean config_set(char *name, ConfigValueType type, ConfigValue value)