summaryrefslogtreecommitdiff
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:24 -0400
commitd3cbdd1d72904d73d02c2c7ec4342dd2734b87cd (patch)
tree15fea350ec5101932eba4b069a458f63baa38f74
parenta0b97d429f25112a231ce57bae8dc45e37ff4f38 (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
-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 701b18d56..44fbc2e88 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -484,6 +484,7 @@ _desc_init(void)
484 ELM_CONFIG_VAL(D, T, config_version, T_INT); 484 ELM_CONFIG_VAL(D, T, config_version, T_INT);
485 ELM_CONFIG_VAL(D, T, engine, T_STRING); 485 ELM_CONFIG_VAL(D, T, engine, T_STRING);
486 ELM_CONFIG_VAL(D, T, accel, T_STRING); 486 ELM_CONFIG_VAL(D, T, accel, T_STRING);
487 ELM_CONFIG_VAL(D, T, accel_override, T_UCHAR);
487 ELM_CONFIG_VAL(D, T, vsync, T_UCHAR); 488 ELM_CONFIG_VAL(D, T, vsync, T_UCHAR);
488 ELM_CONFIG_VAL(D, T, thumbscroll_enable, T_UCHAR); 489 ELM_CONFIG_VAL(D, T, thumbscroll_enable, T_UCHAR);
489 ELM_CONFIG_VAL(D, T, thumbscroll_threshold, T_INT); 490 ELM_CONFIG_VAL(D, T, thumbscroll_threshold, T_INT);
@@ -1492,7 +1493,6 @@ _config_load(void)
1492 if (_elm_config->thumbscroll_flick_distance_tolerance == 0) 1493 if (_elm_config->thumbscroll_flick_distance_tolerance == 0)
1493 _elm_config->thumbscroll_flick_distance_tolerance = 1000; 1494 _elm_config->thumbscroll_flick_distance_tolerance = 1000;
1494 1495
1495 _elm_config->accel_override = 0;
1496 return; 1496 return;
1497 } 1497 }
1498 1498
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 0a173689b..f75c15bed 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2928,17 +2928,15 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data)
2928static Eina_Bool 2928static Eina_Bool
2929_accel_is_gl(void) 2929_accel_is_gl(void)
2930{ 2930{
2931 const char *str; 2931 const char *env = NULL;
2932 2932 const char *str = NULL;
2933 str = _elm_config->accel; 2933
2934 if (!_elm_config->accel_override) 2934 if (_elm_config->accel) str = _elm_config->accel;
2935 { 2935 if (_elm_accel_preference) str = _elm_accel_preference;
2936 const char *env = NULL; 2936 if ((_elm_config->accel_override) && (_elm_config->accel))
2937 2937 str = _elm_config->accel;
2938 env = getenv("ELM_ACCEL"); 2938 env = getenv("ELM_ACCEL");
2939 if (env) str = env; 2939 if (env) str = env;
2940 else if (_elm_accel_preference) str = _elm_accel_preference;
2941 }
2942 if ((str) && 2940 if ((str) &&
2943 ((!strcasecmp(str, "gl")) || 2941 ((!strcasecmp(str, "gl")) ||
2944 (!strcasecmp(str, "opengl")) || 2942 (!strcasecmp(str, "opengl")) ||