forked from enlightenment/enlightenment
remove all LD_LIBRARY_PATH shenanigans from e17
ticket #1542 SVN revision: 77735
This commit is contained in:
parent
f8717d093c
commit
b8677593fc
|
@ -221,7 +221,6 @@ e_desklock_show(Eina_Bool suspend)
|
|||
_e_custom_desklock_exe_handler =
|
||||
ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
|
||||
_e_desklock_cb_custom_desklock_exit, NULL);
|
||||
e_util_library_path_strip();
|
||||
if (e_config->desklock_language)
|
||||
e_intl_language_set(e_config->desklock_language);
|
||||
|
||||
|
@ -229,7 +228,6 @@ e_desklock_show(Eina_Bool suspend)
|
|||
e_xkb_layout_set(e_config->xkb.desklock_layout);
|
||||
_e_custom_desklock_exe =
|
||||
ecore_exe_run(e_config->desklock_custom_desklock_cmd, NULL);
|
||||
e_util_library_path_restore();
|
||||
_e_desklock_state = EINA_TRUE;
|
||||
return 1;
|
||||
}
|
||||
|
|
|
@ -409,9 +409,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
|
|||
desktop->path);
|
||||
return NULL;
|
||||
}
|
||||
e_util_library_path_strip();
|
||||
exe = ecore_exe_run(exec, inst);
|
||||
e_util_library_path_restore();
|
||||
if (chdir(buf))
|
||||
{
|
||||
e_util_dialog_show
|
||||
|
@ -426,7 +424,6 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
|
|||
}
|
||||
else
|
||||
{
|
||||
e_util_library_path_strip();
|
||||
if ((desktop) && (desktop->terminal))
|
||||
{
|
||||
Efreet_Desktop *tdesktop;
|
||||
|
@ -458,7 +455,6 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
|
|||
}
|
||||
else
|
||||
exe = ecore_exe_run(exec, inst);
|
||||
e_util_library_path_restore();
|
||||
}
|
||||
|
||||
if (penv_display)
|
||||
|
|
|
@ -345,9 +345,7 @@ e_intl_input_method_set(const char *imc_path)
|
|||
|
||||
if (E_EXE_IS_VALID(imc->e_im_exec))
|
||||
{
|
||||
e_util_library_path_strip();
|
||||
_e_intl_input_method_exec = ecore_exe_run(imc->e_im_exec, NULL);
|
||||
e_util_library_path_restore();
|
||||
ecore_exe_tag_set(_e_intl_input_method_exec, "E/im_exec");
|
||||
|
||||
if ((!_e_intl_input_method_exec) ||
|
||||
|
|
|
@ -290,15 +290,9 @@ main(int argc, char **argv)
|
|||
}
|
||||
|
||||
if (really_know)
|
||||
{
|
||||
_env_path_append("PATH", eina_prefix_bin_get(pfx));
|
||||
_env_path_append("LD_LIBRARY_PATH", eina_prefix_lib_get(pfx));
|
||||
}
|
||||
_env_path_append("PATH", eina_prefix_bin_get(pfx));
|
||||
else
|
||||
{
|
||||
_env_path_prepend("PATH", eina_prefix_bin_get(pfx));
|
||||
_env_path_prepend("LD_LIBRARY_PATH", eina_prefix_lib_get(pfx));
|
||||
}
|
||||
_env_path_prepend("PATH", eina_prefix_bin_get(pfx));
|
||||
|
||||
if (valgrind_mode || valgrind_tool)
|
||||
{
|
||||
|
|
|
@ -190,9 +190,7 @@ e_util_head_exec(int head, const char *cmd)
|
|||
strcpy(buf, penv_display);
|
||||
|
||||
ok = 1;
|
||||
e_util_library_path_strip();
|
||||
exe = ecore_exe_run(cmd, NULL);
|
||||
e_util_library_path_restore();
|
||||
if (!exe)
|
||||
{
|
||||
e_util_dialog_show(_("Run Error"),
|
||||
|
@ -961,53 +959,6 @@ e_util_file_time_get(time_t ftime)
|
|||
return s;
|
||||
}
|
||||
|
||||
//static char *prev_ld_library_path = NULL;
|
||||
//static char *prev_path = NULL;
|
||||
|
||||
EAPI void
|
||||
e_util_library_path_strip(void)
|
||||
{
|
||||
/* disabled as i think we dont need/want this anymore - leftover from a bygone era
|
||||
char *p, *p2;
|
||||
|
||||
p = getenv("LD_LIBRARY_PATH");
|
||||
E_FREE(prev_ld_library_path);
|
||||
if (p)
|
||||
{
|
||||
prev_ld_library_path = strdup(p);
|
||||
p2 = strchr(p, ':');
|
||||
if (p2) p2++;
|
||||
e_util_env_set("LD_LIBRARY_PATH", p2);
|
||||
}
|
||||
p = getenv("PATH");
|
||||
E_FREE(prev_path);
|
||||
if (p)
|
||||
{
|
||||
prev_path = strdup(p);
|
||||
p2 = strchr(p, ':');
|
||||
if (p2) p2++;
|
||||
e_util_env_set("PATH", p2);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_util_library_path_restore(void)
|
||||
{
|
||||
/* disabled as i think we dont need/want this anymore - leftover from a bygone era
|
||||
if (prev_ld_library_path)
|
||||
{
|
||||
e_util_env_set("LD_LIBRARY_PATH", prev_ld_library_path);
|
||||
E_FREE(prev_ld_library_path);
|
||||
}
|
||||
if (prev_path)
|
||||
{
|
||||
e_util_env_set("PATH", prev_path);
|
||||
E_FREE(prev_path);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
e_util_icon_add(const char *path, Evas *evas)
|
||||
{
|
||||
|
|
|
@ -45,8 +45,6 @@ EAPI int e_util_icon_save(Ecore_X_Icon *icon, const char *filename);
|
|||
EAPI char *e_util_shell_env_path_eval(const char *path);
|
||||
EAPI char *e_util_size_string_get(off_t size);
|
||||
EAPI char *e_util_file_time_get(time_t ftime);
|
||||
EAPI void e_util_library_path_strip(void);
|
||||
EAPI void e_util_library_path_restore(void);
|
||||
EAPI Evas_Object *e_util_icon_add(const char *path, Evas *evas);
|
||||
EAPI Evas_Object *e_util_desktop_icon_add(Efreet_Desktop *desktop, unsigned int size, Evas *evas);
|
||||
EAPI Evas_Object *e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas);
|
||||
|
|
|
@ -266,9 +266,7 @@ _e_imc_setup_cb(void *data, void *data2 __UNUSED__)
|
|||
|
||||
cmd = imc->e_im_setup_exec;
|
||||
|
||||
e_util_library_path_strip();
|
||||
exe = ecore_exe_run(cmd, NULL);
|
||||
e_util_library_path_restore();
|
||||
|
||||
if (!exe)
|
||||
{
|
||||
|
@ -517,9 +515,7 @@ _e_imc_adv_setup_cb(void *data, void *data2 __UNUSED__)
|
|||
|
||||
cmd = cfdata->imc.e_im_setup_exec;
|
||||
|
||||
e_util_library_path_strip();
|
||||
exe = ecore_exe_run(cmd, NULL);
|
||||
e_util_library_path_restore();
|
||||
|
||||
if (!exe)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue