E CVS: libs/ecore handyande

[<enl...@li...>]

Enlightenment CVS committal

Author  : handyande
Project : e17
Module  : libs/ecore

Dir     : e17/libs/ecore/src/lib/ecore_config


Modified Files:
	Ecore_Config.h Makefile.am convenience.c ecore_config.c 


Log Message:
Re-add font paths after rasters rearrangement
publicise the default theme search path so ti can be applied on init - this way the search path is always defined
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/Ecore_Config.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- Ecore_Config.h	12 May 2004 23:24:36 -0000	1.30
+++ Ecore_Config.h	13 May 2004 14:38:36 -0000	1.31
@@ -226,6 +226,7 @@
    /* FIXME: this should only be included if evas is present */
    int                 ecore_config_evas_font_path_apply(Evas * evas);
    char               *ecore_config_theme_search_path_get(void);
+   char               *ecore_config_theme_default_path_get(void);
    char               *ecore_config_theme_with_path_from_name_get(char *name);
    char               *ecore_config_theme_with_path_get(const char *key);
    void                ecore_config_args_display(void);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- Makefile.am	13 May 2004 12:50:06 -0000	1.18
+++ Makefile.am	13 May 2004 14:38:36 -0000	1.19
@@ -18,6 +18,7 @@
 DB = system.db
 $(DB): Makefile
 	edb_ed $(top_builddir)/src/lib/ecore_config/$(DB) add /e/theme/name str "winter"
+	edb_ed $(top_builddir)/src/lib/ecore_config/$(DB) add /e/font/path str "$(pkgdatadir)/data/fonts"
 	edb_ed $(top_builddir)/src/lib/ecore_config/$(DB) add /apps/web/browser str `which firefox 2>/dev/null || which phoenix 2>/dev/null || which mozilla 2>/dev/null || which opera 2>/dev/null || which konqueror 2>/dev/null || which epiphany 2>/dev/null`
 	edb_ed $(top_builddir)/src/lib/ecore_config/$(DB) add /apps/web/email str `which thunderbird 2>/dev/null || which mozilla 2>/dev/null || which kmail 2>/dev/null || which sylpheed 2>/dev/null || which evolution 2>/dev/null`
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/convenience.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- convenience.c	13 May 2004 09:53:58 -0000	1.14
+++ convenience.c	13 May 2004 14:38:36 -0000	1.15
@@ -294,7 +294,7 @@
    return ECORE_CONFIG_ERR_SUCC;
 }
 
-static char        *
+char               *
 ecore_config_theme_default_path_get(void)
 {
    char               *path, *home;
@@ -340,6 +340,7 @@
    char               *search_path;
    search_path = ecore_config_string_get("/e/themes/search_path");
 
+   /* this should no longer be the case, as it is defaulted in init */
    if (!search_path)
      {
         search_path = ecore_config_theme_default_path_get();
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/ecore_config.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ecore_config.c	12 May 2004 14:40:07 -0000	1.32
+++ ecore_config.c	13 May 2004 14:38:36 -0000	1.33
@@ -1269,6 +1269,9 @@
    __ecore_config_bundle_local =
       ecore_config_bundle_new(__ecore_config_server_local, "config");
 
+   ecore_config_string_default("/e/themes/search_path", 
+			       ecore_config_theme_default_path_get());
+
    if ((p = getenv("HOME")))
      {				/* debug-only ### FIXME */
 	if ((buf = malloc(PATH_MAX * sizeof(char))))