summaryrefslogtreecommitdiff
path: root/src/lib
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
commit5790a8d3d24f178c47c7217f30d741039812288a (patch)
treee5277896f12e152d9f90b37521b116f62c6d8186 /src/lib
parent458186b743583c55694f5920d159b3a10a9a541a (diff)
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 'src/lib')
-rw-r--r--src/lib/elm_config.c2
-rw-r--r--src/lib/elm_win.c20
2 files changed, 10 insertions, 12 deletions
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index fb8e9b6f6..193ec6be7 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -480,6 +480,7 @@ _desc_init(void)
480 ELM_CONFIG_VAL(D, T, config_version, T_INT); 480 ELM_CONFIG_VAL(D, T, config_version, T_INT);
481 ELM_CONFIG_VAL(D, T, engine, T_STRING); 481 ELM_CONFIG_VAL(D, T, engine, T_STRING);
482 ELM_CONFIG_VAL(D, T, accel, T_STRING); 482 ELM_CONFIG_VAL(D, T, accel, T_STRING);
483 ELM_CONFIG_VAL(D, T, accel_override, T_UCHAR);
483 ELM_CONFIG_VAL(D, T, vsync, T_UCHAR); 484 ELM_CONFIG_VAL(D, T, vsync, T_UCHAR);
484 ELM_CONFIG_VAL(D, T, thumbscroll_enable, T_UCHAR); 485 ELM_CONFIG_VAL(D, T, thumbscroll_enable, T_UCHAR);
485 ELM_CONFIG_VAL(D, T, thumbscroll_threshold, T_INT); 486 ELM_CONFIG_VAL(D, T, thumbscroll_threshold, T_INT);
@@ -1488,7 +1489,6 @@ _config_load(void)
1488 if (_elm_config->thumbscroll_flick_distance_tolerance == 0) 1489 if (_elm_config->thumbscroll_flick_distance_tolerance == 0)
1489 _elm_config->thumbscroll_flick_distance_tolerance = 1000; 1490 _elm_config->thumbscroll_flick_distance_tolerance = 1000;
1490 1491
1491 _elm_config->accel_override = 0;
1492 return; 1492 return;
1493 } 1493 }
1494 1494
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 116896a16..e3b05650d 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2943,17 +2943,15 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data)
2943static Eina_Bool 2943static Eina_Bool
2944_accel_is_gl(void) 2944_accel_is_gl(void)
2945{ 2945{
2946 const char *str; 2946 const char *env = NULL;
2947 2947 const char *str = NULL;
2948 str = _elm_config->accel; 2948
2949 if (!_elm_config->accel_override) 2949 if (_elm_config->accel) str = _elm_config->accel;
2950 { 2950 if (_elm_accel_preference) str = _elm_accel_preference;
2951 const char *env = NULL; 2951 if ((_elm_config->accel_override) && (_elm_config->accel))
2952 2952 str = _elm_config->accel;
2953 env = getenv("ELM_ACCEL"); 2953 env = getenv("ELM_ACCEL");
2954 if (env) str = env; 2954 if (env) str = env;
2955 else if (_elm_accel_preference) str = _elm_accel_preference;
2956 }
2957 if ((str) && 2955 if ((str) &&
2958 ((!strcasecmp(str, "gl")) || 2956 ((!strcasecmp(str, "gl")) ||
2959 (!strcasecmp(str, "opengl")) || 2957 (!strcasecmp(str, "opengl")) ||