Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h config.c cursors.c menus.c
Log Message:
Don't preparse internal config file.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -3 -r1.371 -r1.372
--- E.h 16 Feb 2005 17:57:19 -0000 1.371
+++ E.h 16 Feb 2005 19:48:14 -0000 1.372
@@ -1321,7 +1321,7 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- config.c 7 Feb 2005 22:42:18 -0000 1.126
+++ config.c 16 Feb 2005 19:48:27 -0000 1.127
@@ -466,7 +466,7 @@
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 @@
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 @@
}
}
- 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 @@
/* Loose ends... */
Esnprintf(s, sizeof(s), "%s.misc", EGetSavePrefix());
- ConfigFileLoad(s, NULL, ConfigFileRead);
+ ConfigFileLoad(s, NULL, ConfigFileRead, 0);
BordersSetupFallback();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/cursors.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- cursors.c 28 Dec 2004 23:46:44 -0000 1.22
+++ cursors.c 16 Feb 2005 19:48:32 -0000 1.23
@@ -310,7 +310,7 @@
switch (sig)
{
case ESIGNAL_INIT:
- ConfigFileLoad("cursors.cfg", Mode.theme.path, ECursorConfigLoad);
+ ConfigFileLoad("cursors.cfg", Mode.theme.path, ECursorConfigLoad, 1);
CursorsInit();
break;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -3 -r1.167 -r1.168
--- menus.c 12 Feb 2005 16:42:36 -0000 1.167
+++ menus.c 16 Feb 2005 19:48:33 -0000 1.168
@@ -2146,7 +2146,7 @@
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 @@
else if (!strncmp(cmd, "reload", 2))
{
MenusDestroyLoaded();
- ConfigFileLoad("menus.cfg", NULL, MenuConfigLoad);
+ ConfigFileLoad("menus.cfg", NULL, MenuConfigLoad, 1);
}
else if (!strncmp(cmd, "show", 2))
{
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
