raster pushed a commit to branch elementary-1.13.
http://git.enlightenment.org/core/elementary.git/commit/?id=cd43e56bbd0e0b57ac8e3ac245e8b754c4deb7cb
commit cd43e56bbd0e0b57ac8e3ac245e8b754c4deb7cb
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Tue Feb 10 19:48:21 2015 +0900
elm engine - restore explicit use of ELM_ENGNE env var
this fixes a deprecation of elm engine done just before 1.13 release
that ends up breaking "make doc" and also will make ELM_ENGINE env var
stop working (the latter was intentional). but since this is relied on
for things like make doc - keep the env var and haveit set preferred
engine and let people migrate away from using the engine var EXCEPT
for things like the shot engine
@fix
---
src/lib/elm_config.c | 3 ++-
src/lib/elm_win.c | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 9fa9c0d..1d6aa75 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1909,6 +1909,8 @@ _env_get(void)
eina_stringshare_replace(&_elm_config->engine, ELM_SOFTWARE_DDRAW);
else
ERR("Unknown engine '%s'.", s);
+ if (_elm_config->engine)
+ eina_stringshare_replace(&_elm_preferred_engine,
_elm_config->engine);
}
s = getenv("ELM_VSYNC");
@@ -3202,7 +3204,6 @@ _elm_config_init(void)
_profile_fetch_from_conf();
_config_load();
_env_get();
- ELM_SAFE_FREE(_elm_preferred_engine, eina_stringshare_del);
ELM_SAFE_FREE(_elm_accel_preference, eina_stringshare_del);
_translation_init();
_config_apply();
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 1fa38e7..ce368db 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3171,8 +3171,7 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const
char *name, Elm_Win_Type t
}
#endif
#ifdef HAVE_ELEMENTARY_X
- else if (!elm_config_engine_get() &&
- !elm_config_preferred_engine_get() &&
+ else if (!_elm_preferred_engine &&
getenv("DISPLAY") && !getenv("ELM_ENGINE"))
{
if (_accel_is_gl())
@@ -3188,8 +3187,7 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const
char *name, Elm_Win_Type t
}
#endif
#ifdef HAVE_ELEMENTARY_WAYLAND
- else if (!elm_config_engine_get() &&
- !elm_config_preferred_engine_get() &&
+ else if (!_elm_preferred_engine &&
getenv("WAYLAND_DISPLAY") && !getenv("ELM_ENGINE"))
{
if (_accel_is_gl())
@@ -3208,6 +3206,8 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const
char *name, Elm_Win_Type t
{
if (_accel_is_gl())
{
+// add all engines with selected engine first - if any
+ enginelist[p++] = ENGINE_GET();
// add all engines with gl/accelerated ones first - only engines compiled
#ifdef HAVE_ELEMENTARY_X
--
