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

elm: remove ecore-x init from quicklaunch post-fork 

this is invalid for basically every possible case. allow components
to naturally call this function as needed

@fix
This commit is contained in:
Mike Blumenkrantz 2018-02-07 13:32:08 -05:00
parent b7bec2ba9a
commit 80cc3f230d
1 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib/elementary/elm_main.c
View File

@ -1146,39 +1146,6 @@ elm_quicklaunch_fork(int argc,
evas_init();
_elm_module_init();
_elm_config_sub_init();
# ifdef HAVE_ELEMENTARY_X
{
Eina_Bool init_x;
const char *ev = getenv("ELM_DISPLAY");
Eina_Bool have_display = !!getenv("DISPLAY");
if (ev) /* If ELM_DISPLAY is specified */
{
if (!strcmp(ev, "x11")) /* and it is X11 */
{
if (!have_display) /* if there is no $DISPLAY */
{
ERR("$ELM_DISPLAY is set to x11 but $DISPLAY"
" is not set");
init_x = EINA_FALSE;
}
else /* if there is */
init_x = EINA_TRUE;
}
else /* not X11 */
init_x = EINA_FALSE;
}
else /* ELM_DISPLAY not specified */
{
if (have_display) /* If there is a $DISPLAY */
init_x = EINA_TRUE;
else /* No $DISPLAY */
init_x = EINA_FALSE;
}
if (init_x)
ecore_x_init(NULL);
}
# endif
ecore_evas_init(); // FIXME: check errors
ecore_imf_init();
#endif