From 7b6c705fd2860554eab337f9d1ade42f8255a5e5 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <m.blumenkran@samsung.com>
Date: Fri, 26 Jul 2013 13:15:48 +0100
Subject: [PATCH] bugfix: border style remembers

T248
---
 src/bin/e_border.c   |  1 +
 src/bin/e_remember.c | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index efe49076c..a22962ab0 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -8272,6 +8272,7 @@ _e_border_eval0(E_Border *bd)
                   //	     edje_object_message_signal_process(bd->bg_object);
                   //	     e_border_frame_recalc(bd);
                }
+             rem_change = 1;
           }
         bd->client.border.changed = 0;
      }
diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c
index 078e93a83..4336d8561 100644
--- a/src/bin/e_remember.c
+++ b/src/bin/e_remember.c
@@ -456,6 +456,8 @@ _e_remember_update(E_Border *bd, E_Remember *rem)
      rem->prop.offer_resistance = bd->offer_resistance;
    if (rem->apply & E_REMEMBER_APPLY_OPACITY)
      rem->prop.opacity = bd->client.netwm.opacity;
+   if (rem->apply & E_REMEMBER_APPLY_BORDER)
+     eina_stringshare_replace(&rem->prop.border, bd->bordername);
    rem->no_reopen = bd->internal_no_reopen;
    {
       E_Event_Remember_Update *ev;
@@ -844,12 +846,11 @@ _e_remember_cb_hook_pre_post_fetch(void *data __UNUSED__, void *border)
      }
    if (rem->apply & E_REMEMBER_APPLY_BORDER)
      {
-        if (rem->prop.border)
-          {
-             eina_stringshare_replace(&bd->bordername, NULL);
-             bd->bordername = eina_stringshare_ref(rem->prop.border);
-             bd->client.border.changed = 1;
-          }
+        eina_stringshare_replace(&bd->bordername, NULL);
+        bd->bordername = eina_stringshare_ref(rem->prop.border);
+        if (!bd->bordername) bd->borderless = 1;
+        bd->client.border.changed = 1;
+        BD_CHANGED(bd);
      }
    if (rem->apply & E_REMEMBER_APPLY_FULLSCREEN)
      {