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

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
This commit is contained in:
Carsten Haitzler 2015-02-10 19:48:21 +09:00
parent 25e9a4de40
commit 4aab4fd356
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/elementary/src/lib/elm_config.c
View File

@ -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();

8
legacy/elementary/src/lib/elm_win.c
View File

@ -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