e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't preparse internal config file. 

SVN revision: 13407
This commit is contained in:
Kim Woelders 2005-02-16 19:48:33 +00:00
parent d9c30e3167
commit 0f06a8bee6
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/E.h
View File

@ -1321,7 +1321,7 @@ char *ThemeFileFind(const char *file);
char *ConfigFileFind(const char *name, const char *themepath,
int pp);
int ConfigFileLoad(const char *name, const char *themepath,
int (*parse) (FILE * fs));
int (*parse) (FILE * fs), int preparse);
int ThemeConfigLoad(void);
void SaveUserControlConfig(void);
void RecoverUserConfig(void);

8
src/config.c
View File

@ -466,7 +466,7 @@ ConfigFileFind(const char *name, const char *themepath, int pp)
int
ConfigFileLoad(const char *name, const char *themepath,
int (*parse) (FILE * fs))
int (*parse) (FILE * fs), int preparse)
{
int err = -1;
char *file;
@ -475,7 +475,7 @@ ConfigFileLoad(const char *name, const char *themepath,
if (EventDebug(EDBUG_TYPE_CONFIG))
Eprintf("ConfigFileLoad %s\n", name);
file = ConfigFileFind(name, themepath, 1);
file = ConfigFileFind(name, themepath, preparse);
if (!file)
goto done;
fs = fopen(file, "r");
@ -538,7 +538,7 @@ ThemeConfigLoad(void)
}
}
ConfigFileLoad(config_files[i], Mode.theme.path, ConfigFileRead);
ConfigFileLoad(config_files[i], Mode.theme.path, ConfigFileRead, 1);
if (p)
ProgressbarSet(p, (i * 100) /
@ -553,7 +553,7 @@ ThemeConfigLoad(void)
/* Loose ends... */
Esnprintf(s, sizeof(s), "%s.misc", EGetSavePrefix());
ConfigFileLoad(s, NULL, ConfigFileRead);
ConfigFileLoad(s, NULL, ConfigFileRead, 0);
BordersSetupFallback();

2
src/cursors.c
View File

@ -310,7 +310,7 @@ CursorSighan(int sig, void *prm __UNUSED__)
switch (sig)
{
case ESIGNAL_INIT:
ConfigFileLoad("cursors.cfg", Mode.theme.path, ECursorConfigLoad);
ConfigFileLoad("cursors.cfg", Mode.theme.path, ECursorConfigLoad, 1);
CursorsInit();
break;
}

4
src/menus.c
View File

@ -2146,7 +2146,7 @@ MenusSighan(int sig, void *prm __UNUSED__)
switch (sig)
{
case ESIGNAL_CONFIGURE:
ConfigFileLoad("menus.cfg", NULL, MenuConfigLoad);
ConfigFileLoad("menus.cfg", NULL, MenuConfigLoad, 1);
break;
case ESIGNAL_AREA_SWITCH_START:
@ -2198,7 +2198,7 @@ MenusIpc(const char *params, Client * c __UNUSED__)
else if (!strncmp(cmd, "reload", 2))
{
MenusDestroyLoaded();
ConfigFileLoad("menus.cfg", NULL, MenuConfigLoad);
ConfigFileLoad("menus.cfg", NULL, MenuConfigLoad, 1);
}
else if (!strncmp(cmd, "show", 2))
{