- fixed e_remember_default_match to set match values

  since these are not set by e_remember_update anymore
- remove E_Remember parameter from e_remmber_update. 
  if update is possible bd->remember is already set
- do not overwrite bordername value of remember on update. 
  should only be set by conf_border dialog
- make sure on update that match values are set otherwise 
  delete remember 


SVN revision: 42435

1 files changed, 13 insertions, 8 deletions

diff --git a/src/modules/conf_borders/e_int_config_borders.c b/src/modules/conf_borders/e_int_config_borders.c
index bbedb2dc3e..37c527466d 100644
--- a/src/modules/conf_borders/e_int_config_borders.c
+++ b/src/modules/conf_borders/e_int_config_borders.c
@@ -151,17 +151,22 @@ _basic_apply_border(E_Config_Dialog_Data *cfdata)
      }
    if (cfdata->remember_border) 
      {
-	if (!cfdata->border->remember) 
+	E_Remember *rem = cfdata->border->remember;
+
+	if (!rem) 
 	  {
-             cfdata->border->remember = e_remember_new();
-             if (cfdata->border->remember)
-	       e_remember_use(cfdata->border->remember);
+             rem = e_remember_new();
+             if (rem)
+	       e_remember_use(rem);
 	  }
-	if (cfdata->border->remember) 
+	if (rem) 
 	  {
-	     cfdata->border->remember->apply |= E_REMEMBER_APPLY_BORDER;
-             cfdata->border->remember->match = e_remember_default_match(cfdata->border);
-             e_remember_update(cfdata->border->remember, cfdata->border);
+	     rem->apply |= E_REMEMBER_APPLY_BORDER;
+             e_remember_default_match_set(rem, cfdata->border);
+	     if (rem->prop.border) eina_stringshare_del(rem->prop.border);
+	     rem->prop.border = eina_stringshare_add(cfdata->border->bordername);
+	     cfdata->border->remember = rem;
+             e_remember_update(cfdata->border);
 	  }
      }
    else