Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h aclass.c config.c sound.c
Log Message:
Skip preprocessing of some config files.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.79
retrieving revision 1.314.2.80
diff -u -3 -r1.314.2.79 -r1.314.2.80
--- E.h 28 Dec 2004 16:31:52 -0000 1.314.2.79
+++ E.h 28 Dec 2004 17:48:52 -0000 1.314.2.80
@@ -1402,7 +1402,8 @@
void ConfigAlertLoad(const char *txt);
char *FindFile(const char *file, const char *themepath);
char *ThemeFileFind(const char *file);
-char *ConfigFileFind(const char *name, const char *themepath);
+char *ConfigFileFind(const char *name, const char *themepath,
+ int pp);
int ConfigFileLoad(const char *name, const char *themepath,
int (*parse) (FILE * fs));
int ThemeConfigLoad(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/aclass.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -3 -r1.1.2.6 -r1.1.2.7
--- aclass.c 5 Dec 2004 11:07:20 -0000 1.1.2.6
+++ aclass.c 28 Dec 2004 17:49:08 -0000 1.1.2.7
@@ -687,7 +687,7 @@
char *file;
FILE *fs;
- file = ConfigFileFind("bindings.cfg", NULL);
+ file = ConfigFileFind("bindings.cfg", NULL, 0);
if (!file)
return;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.111.2.24
retrieving revision 1.111.2.25
diff -u -3 -r1.111.2.24 -r1.111.2.25
--- config.c 28 Dec 2004 16:31:52 -0000 1.111.2.24
+++ config.c 28 Dec 2004 17:49:08 -0000 1.111.2.25
@@ -427,7 +427,7 @@
}
char *
-ConfigFileFind(const char *name, const char *themepath)
+ConfigFileFind(const char *name, const char *themepath, int pp)
{
char s[FILEPATH_LEN_MAX];
char *fullname, *file, *ppfile;
@@ -439,6 +439,10 @@
if (!fullname)
EDBUG_RETURN(NULL);
+ /* Quit if not preparsing */
+ if (!pp)
+ return fullname;
+
/* The file exists. Now check the preparsed one. */
file = Estrdup(fullname);
for (i = 0; file[i]; i++)
@@ -475,7 +479,7 @@
if (EventDebug(EDBUG_TYPE_CONFIG))
Eprintf("ConfigFileLoad %s\n", name);
- file = ConfigFileFind(name, themepath);
+ file = ConfigFileFind(name, themepath, 1);
if (!file)
goto done;
fs = fopen(file, "r");
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/sound.c,v
retrieving revision 1.25.2.10
retrieving revision 1.25.2.11
diff -u -3 -r1.25.2.10 -r1.25.2.11
--- sound.c 24 Dec 2004 14:03:56 -0000 1.25.2.10
+++ sound.c 28 Dec 2004 17:49:08 -0000 1.25.2.11
@@ -355,7 +355,7 @@
FILE *fs;
char *file;
- file = ConfigFileFind("sound.cfg", Mode.theme.path);
+ file = ConfigFileFind("sound.cfg", Mode.theme.path, 1);
if (!file)
goto done;
fs = fopen(file, "r");
-------------------------------------------------------
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://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
