From f0664aca95bd62c2b37bd0972a9c2edbafd1f25c Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 18 Aug 2012 05:07:43 +0000 Subject: [PATCH] fix rememebr border style aply disable/enable bug. SVN revision: 75400 --- src/modules/conf_theme/e_int_config_borders.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/conf_theme/e_int_config_borders.c b/src/modules/conf_theme/e_int_config_borders.c index 73f4df077..a1f3ae458 100644 --- a/src/modules/conf_theme/e_int_config_borders.c +++ b/src/modules/conf_theme/e_int_config_borders.c @@ -116,10 +116,16 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) static int _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { + Eina_Bool remch = ((cfdata->remember_border && + !((cfdata->border->remember) && + (cfdata->border->remember->apply & E_REMEMBER_APPLY_BORDER))) || + (!cfdata->remember_border && + ((cfdata->border->remember) && + (cfdata->border->remember->apply & E_REMEMBER_APPLY_BORDER)))); if (cfdata->border) - return cfdata->bordername != cfdata->border->client.border.name; + return (cfdata->bordername != cfdata->border->client.border.name) || (remch); else - return cfdata->bordername != e_config->theme_default_border_style; + return (cfdata->bordername != e_config->theme_default_border_style) || (remch); } static int