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

use new eina prefix fun 

SVN revision: 58855
This commit is contained in:
Carsten Haitzler 2011-04-24 08:18:00 +00:00
parent 90a70f1080
commit 1cd4e44b23
2 changed files with 15 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elementary/configure.ac
View File

@ -201,7 +201,7 @@ AM_CONDITIONAL([ELEMENTARY_WINDOWS_BUILD], [test "x${have_windows}" = "xyes"])
PKG_CHECK_MODULES([ELEMENTARY],
[
eina >= 1.0.0
eina >= 1.0.999
eet >= 1.4.0
evas >= 1.0.999
ecore >= 1.0.0

83
legacy/elementary/src/lib/elm_main.c
View File

@ -290,6 +290,7 @@ static Eina_Bool _elm_signal_exit(void *data,
int ev_type,
void *ev);
static Eina_Prefix *pfx = NULL;
char *_elm_appname = NULL;
const char *_elm_data_dir = NULL;
const char *_elm_lib_dir = NULL;
@ -453,8 +454,6 @@ EAPI int
elm_quicklaunch_init(int argc,
char **argv)
{
char buf[PATH_MAX], *s;
_elm_ql_init_count++;
if (_elm_ql_init_count > 1) return _elm_ql_init_count;
eina_init();
@ -479,75 +478,19 @@ elm_quicklaunch_init(int argc,
if (argv) _elm_appname = strdup(ecore_file_file_get(argv[0]));
if (!_elm_data_dir)
pfx = eina_prefix_new(NULL, elm_init,
"ELM", "elementary", "config/profile.cfg",
PACKAGE_LIB_DIR, /* don't have a bin dir currently */
PACKAGE_LIB_DIR,
PACKAGE_DATA_DIR,
LOCALE_DIR);
if (pfx)
{
s = getenv("ELM_DATA_DIR");
_elm_data_dir = eina_stringshare_add(s);
_elm_data_dir = eina_stringshare_add(eina_prefix_data_get(pfx));
_elm_lib_dir = eina_stringshare_add(eina_prefix_lib_get(pfx));
}
if (!_elm_data_dir)
{
s = getenv("ELM_PREFIX");
if (s)
{
snprintf(buf, sizeof(buf), "%s/share/elementary", s);
_elm_data_dir = eina_stringshare_add(buf);
}
}
if (!_elm_lib_dir)
{
s = getenv("ELM_LIB_DIR");
_elm_lib_dir = eina_stringshare_add(s);
}
if (!_elm_lib_dir)
{
s = getenv("ELM_PREFIX");
if (s)
{
snprintf(buf, sizeof(buf), "%s/lib", s);
_elm_lib_dir = eina_stringshare_add(buf);
}
}
#ifdef HAVE_DLADDR
if ((!_elm_data_dir) || (!_elm_lib_dir))
{
Dl_info elementary_dl;
// libelementary.so/../../share/elementary/
if (dladdr(elm_init, &elementary_dl))
{
char *dir, *dir2;
dir = ecore_file_dir_get(elementary_dl.dli_fname);
if (dir)
{
if (!_elm_lib_dir)
{
if (ecore_file_is_dir(dir))
_elm_lib_dir = eina_stringshare_add(dir);
}
if (!_elm_data_dir)
{
dir2 = ecore_file_dir_get(dir);
if (dir2)
{
snprintf(buf, sizeof(buf), "%s/share/elementary", dir2);
if (ecore_file_is_dir(buf))
_elm_data_dir = eina_stringshare_add(buf);
free(dir2);
}
}
free(dir);
}
}
}
#endif
if (!_elm_data_dir)
_elm_data_dir = eina_stringshare_add(PACKAGE_DATA_DIR);
if (!_elm_data_dir)
_elm_data_dir = eina_stringshare_add("/");
if (!_elm_lib_dir)
_elm_lib_dir = eina_stringshare_add(PACKAGE_LIB_DIR);
if (!_elm_lib_dir)
_elm_lib_dir = eina_stringshare_add("/");
if (!_elm_data_dir) _elm_data_dir = eina_stringshare_add("/");
if (!_elm_lib_dir) _elm_lib_dir = eina_stringshare_add("/");
_elm_config_init();
return _elm_ql_init_count;
@ -640,6 +583,8 @@ elm_quicklaunch_shutdown(void)
{
_elm_ql_init_count--;
if (_elm_ql_init_count > 0) return _elm_ql_init_count;
if (pfx) eina_prefix_free(pfx);
pfx = NULL;
eina_stringshare_del(_elm_data_dir);
_elm_data_dir = NULL;
eina_stringshare_del(_elm_lib_dir);