hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=742e311742ac1051a664689b3c9b6103f733dc8c
commit 742e311742ac1051a664689b3c9b6103f733dc8c Author: ChunEon Park <[email protected]> Date: Fri Dec 12 21:56:26 2014 +0900 win: set config engine on higher priority than DISPLAY env var DISPLAY environment variable may set regardless of Elementary/EFL. Mostly user has no way to switch their intent engine such as "buffer" Guarantee work application engine with their intended engine first. @fix --- src/lib/elm_win.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 9f70de5..0caa120 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -3146,9 +3146,10 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t enginelist[p++] = ELM_SOFTWARE_PSL1GHT; } #endif - #ifdef HAVE_ELEMENTARY_X - else if ((getenv("DISPLAY")) && (!getenv("ELM_ENGINE"))) + else if (!elm_config_engine_get() && + !elm_config_preferred_engine_get() && + getenv("DISPLAY") && !getenv("ELM_ENGINE")) { if (_accel_is_gl()) { @@ -3162,9 +3163,10 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t } } #endif - #ifdef HAVE_ELEMENTARY_WAYLAND - else if ((getenv("WAYLAND_DISPLAY")) && (!getenv("ELM_ENGINE"))) + else if (!elm_config_engine_get() && + !elm_config_preferred_engine_get() && + getenv("WAYLAND_DISPLAY") && !getenv("ELM_ENGINE")) { if (_accel_is_gl()) { --
