enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

Avoid possible segs and 

Dude, why you edit my chars


SVN revision: 10219
This commit is contained in:
handyande 2004-05-13 22:56:16 +00:00 committed by handyande
parent 0eb4226a11
commit 07f9a4965d
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,8 +343,12 @@ ecore_config_theme_search_path_get(void)
/* this should no longer be the case, as it is defaulted in init */
if (!search_path)
{
search_path = ecore_config_theme_default_path_get();
ecore_config_string_default("/e/themes/search_path", search_path);
search_path = ecore_config_theme_default_path_get();
if (search_path)
{
ecore_config_string_default("/e/themes/search_path", search_path);
free(search_path);
}
}
return search_path;
}

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

@ -149,7 +149,7 @@ ecore_config_string_get(const char *key)
Ecore_Config_Prop *e;
e = ecore_config_get(key);
return (e && (e->type == PT_STR)) ? e->ptr : NULL;
return (e && (e->type == PT_STR)) ? strdup(e->ptr) : NULL;
}
/**
@ -242,7 +242,7 @@ ecore_config_theme_get(const char *key)
Ecore_Config_Prop *e;
e = ecore_config_get(key);
return (e && (e->type == PT_THM)) ? e->ptr : NULL;
return (e && (e->type == PT_THM)) ? strdup(e->ptr) : NULL;
}
/**
@ -1253,7 +1253,7 @@ ecore_config_init_global(char *name)
int
ecore_config_init(char *name)
{
char *buf, *p;
char *buf, *p, *path;
Ecore_Config_Prop *sys;
__ecore_config_app_name = strdup(name);
@ -1269,8 +1269,12 @@ 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());
path = ecore_config_theme_default_path_get();
if (path)
{
ecore_config_string_default("/e/themes/search_path", path);
free(path);
}
if ((p = getenv("HOME")))
{ /* debug-only ### FIXME */