On Tue, 23 Sep 2014 13:48:05 -0700 Mike Blumenkrantz <[email protected]> said:
this too. it's intended to override whatever the override is. it's a developer (or user) saying very explicitly "right here and now - i want this to happen". if someone is using this for configuration.. then they are "doing it wrong". > discomfitor pushed a commit to branch elementary-1.11. > > http://git.enlightenment.org/core/elementary.git/commit/?id=c924dc52ede44871cee34d7c6e5548d49794afc6 > > commit c924dc52ede44871cee34d7c6e5548d49794afc6 > Author: Mike Blumenkrantz <[email protected]> > Date: Tue Sep 23 16:44:17 2014 -0400 > > elm_win should not check ELM_ACCEL variable if application has overridden > it > also simplify these checks to make it more clear how the ordering should > work > @fix > --- > src/lib/elm_win.c | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) > > diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c > index f75c15b..0a17368 100644 > --- a/src/lib/elm_win.c > +++ b/src/lib/elm_win.c > @@ -2928,15 +2928,17 @@ _window_layout_stack(Evas_Object *o, > Evas_Object_Box_Data *p, void *data) static Eina_Bool > _accel_is_gl(void) > { > - const char *env = NULL; > - const char *str = NULL; > - > - if (_elm_config->accel) str = _elm_config->accel; > - if (_elm_accel_preference) str = _elm_accel_preference; > - if ((_elm_config->accel_override) && (_elm_config->accel)) > - str = _elm_config->accel; > - env = getenv("ELM_ACCEL"); > - if (env) str = env; > + const char *str; > + > + str = _elm_config->accel; > + if (!_elm_config->accel_override) > + { > + const char *env = NULL; > + > + env = getenv("ELM_ACCEL"); > + if (env) str = env; > + else if (_elm_accel_preference) str = _elm_accel_preference; > + } > if ((str) && > ((!strcasecmp(str, "gl")) || > (!strcasecmp(str, "opengl")) || > > -- > > -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) [email protected] ------------------------------------------------------------------------------ Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
