forked from enlightenment/efl
efl/ecore_imf: consider ECORE_IMF_MODULES_DIR.
also do the standard eina_prefix_lib_get() usage as the last one. SVN revision: 82505
This commit is contained in:
parent
01af3144d4
commit
f80eef8806
|
@ -29,8 +29,8 @@ static Eina_Prefix *pfx = NULL;
|
||||||
void
|
void
|
||||||
ecore_imf_module_init(void)
|
ecore_imf_module_init(void)
|
||||||
{
|
{
|
||||||
char *homedir;
|
|
||||||
char buf[PATH_MAX] = "";
|
char buf[PATH_MAX] = "";
|
||||||
|
char *path;
|
||||||
|
|
||||||
pfx = eina_prefix_new(NULL, ecore_imf_init,
|
pfx = eina_prefix_new(NULL, ecore_imf_init,
|
||||||
"ECORE_IMF", "ecore_imf", "checkme",
|
"ECORE_IMF", "ecore_imf", "checkme",
|
||||||
|
@ -72,15 +72,24 @@ ecore_imf_module_init(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "%s/ecore_imf/modules", eina_prefix_lib_get(pfx));
|
path = eina_module_environment_path_get("ECORE_IMF_MODULES_DIR",
|
||||||
|
"/ecore_imf/modules");
|
||||||
module_list = eina_module_arch_list_get(NULL, buf, MODULE_ARCH);
|
if (path)
|
||||||
homedir = eina_module_environment_path_get("HOME", "/.ecore_imf");
|
|
||||||
if (homedir)
|
|
||||||
{
|
{
|
||||||
module_list = eina_module_arch_list_get(module_list, homedir, MODULE_ARCH);
|
module_list = eina_module_arch_list_get(module_list, path, MODULE_ARCH);
|
||||||
free(homedir);
|
free(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
path = eina_module_environment_path_get("HOME", "/.ecore_imf");
|
||||||
|
if (path)
|
||||||
|
{
|
||||||
|
module_list = eina_module_arch_list_get(module_list, path, MODULE_ARCH);
|
||||||
|
free(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
snprintf(buf, sizeof(buf), "%s/ecore_imf/modules", eina_prefix_lib_get(pfx));
|
||||||
|
module_list = eina_module_arch_list_get(module_list, buf, MODULE_ARCH);
|
||||||
|
|
||||||
eina_module_list_load(module_list);
|
eina_module_list_load(module_list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue