aboutsummaryrefslogtreecommitdiffstats
path: root/legacy/elementary/src/lib/elm_win.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2014-09-24 11:32:24 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2014-09-24 11:34:03 -0400
commit34951cf6924ac5edd17c193bfc8c86fc1a180382 (patch)
treef462e6eb5b6e4217a169a8d283adbf2cbfb03d8e /legacy/elementary/src/lib/elm_win.c
parentElm container: Ship missing headers. (diff)
downloadefl-34951cf6924ac5edd17c193bfc8c86fc1a180382.tar.gz
revert most recent two elm engine commits
This reverts commits 123ca6a8744729525889bbc09ee1aff4b2b97b75, 0d527b03f4f630e81ab4480d7160bbf6352b0bac this is still unusable even after being fixed so the fix was unnecessary to begin with
Diffstat (limited to 'legacy/elementary/src/lib/elm_win.c')
-rw-r--r--legacy/elementary/src/lib/elm_win.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 116896a163..e3b05650d1 100644
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@@ -2943,17 +2943,15 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data)
static Eina_Bool
_accel_is_gl(void)
{
- 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;
- }
+ 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;
if ((str) &&
((!strcasecmp(str, "gl")) ||
(!strcasecmp(str, "opengl")) ||