discomfitor pushed a commit to branch enlightenment-0.18.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=63a144ff32d0d990f192bbf5c23223632726c41d
commit 63a144ff32d0d990f192bbf5c23223632726c41d
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Fri Apr 4 13:54:42 2014 -0400
bugfix: comp config dialog correctly detects effects disabled/fast states
CID 1039957, 1039956
---
src/modules/conf_comp/e_mod_config.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/modules/conf_comp/e_mod_config.c
b/src/modules/conf_comp/e_mod_config.c
index e28d2a5..cf79566 100644
--- a/src/modules/conf_comp/e_mod_config.c
+++ b/src/modules/conf_comp/e_mod_config.c
@@ -543,14 +543,14 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED,
e_widget_list_object_append(ol, ob, 1, 0, 0.5);
cfdata->fast =
- (cfdata->fast_menus && cfdata->fast_menus && cfdata->fast_borders &&
cfdata->fast_popups && cfdata->fast_objects);
+ (cfdata->fast_menus && cfdata->fast_overrides && cfdata->fast_borders &&
cfdata->fast_popups && cfdata->fast_objects);
cfdata->fast_ob = ob = e_widget_check_add(evas, _("Enable \"fast\"
composite effects"), &(cfdata->fast));
evas_object_data_set(ob, "cfdata", cfdata);
e_widget_list_object_append(ol, ob, 1, 0, 0.5);
e_widget_on_change_hook_set(ob, _basic_comp_style_fast_toggle, cfdata);
cfdata->match.disable_all =
- (cfdata->match.disable_menus && cfdata->match.disable_menus &&
cfdata->match.disable_borders &&
+ (cfdata->match.disable_menus && cfdata->match.disable_overrides &&
cfdata->match.disable_borders &&
cfdata->match.disable_popups && cfdata->match.disable_objects &&
cfdata->disable_screen_effects);
e_widget_disabled_set(ob, cfdata->match.disable_all);
ob = e_widget_check_add(evas, _("Disable composite effects"),
&(cfdata->match.disable_all));
--
