dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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


SVN revision: 10208
This commit is contained in:
handyande 2004-05-13 14:38:36 +00:00 committed by handyande
parent e0bf1cd441
commit 0eb4226a11
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/ecore/src/lib/ecore_config/Ecore_Config.h
View File

@ -226,6 +226,7 @@ extern "C"
/* 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);

1
legacy/ecore/src/lib/ecore_config/Makefile.am
View File

@ -18,6 +18,7 @@ if BUILD_ECORE_CONFIG
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`

3
legacy/ecore/src/lib/ecore_config/convenience.c
View File

@ -294,7 +294,7 @@ ecore_config_evas_font_path_apply(Evas * evas)
return ECORE_CONFIG_ERR_SUCC;
}
static char *
char *
ecore_config_theme_default_path_get(void)
{
char *path, *home;
@ -340,6 +340,7 @@ ecore_config_theme_search_path_get(void)
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();

3
legacy/ecore/src/lib/ecore_config/ecore_config.c
View File

@ -1269,6 +1269,9 @@ ecore_config_init(char *name)
__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))))