enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

fix wizard module loading when E_MODULE_SRC_PATH is set

This commit is contained in:
Mike Blumenkrantz 2015-07-30 13:24:24 -04:00
parent 043a0b13bb
commit 9bf1bd514b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/wizard/e_mod_main.c
View File

@ -48,6 +48,7 @@ e_modapi_init(E_Module *m)
Eina_List *files;
char buf[PATH_MAX];
char *file;
const char *src_path;
wiz_module = m;
e_wizard_init();
@ -56,7 +57,11 @@ e_modapi_init(E_Module *m)
e_config->scale.use_custom = 1;
e_config->scale.factor = 1.2;
e_scale_update();
snprintf(buf, sizeof(buf), "%s/%s", e_module_dir_get(m), MODULE_ARCH);
src_path = getenv("E_MODULE_SRC_PATH");
if (src_path)
snprintf(buf, sizeof(buf), "%s/.libs", e_module_dir_get(m));
else
snprintf(buf, sizeof(buf), "%s/%s", e_module_dir_get(m), MODULE_ARCH);
files = ecore_file_ls(buf);
files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
EINA_LIST_FREE(files, file)
@ -65,8 +70,11 @@ e_modapi_init(E_Module *m)
{
void *handle;
snprintf(buf, sizeof(buf), "%s/%s/%s",
e_module_dir_get(m), MODULE_ARCH, file);
if (src_path)
snprintf(buf, sizeof(buf), "%s/.libs/%s", e_module_dir_get(m), file);
else
snprintf(buf, sizeof(buf), "%s/%s/%s",
e_module_dir_get(m), MODULE_ARCH, file);
handle = dlopen(buf, RTLD_NOW | RTLD_GLOBAL);
if (handle)
e_wizard_page_add(handle,