[EGIT] [core/elementary] master 01/01: [toolbar] don't leak icons into the UI

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=7c9c8d019ac10229ef5e7debdc388c4ba9f26209

commit 7c9c8d019ac10229ef5e7debdc388c4ba9f26209
Author: Andy Williams <a...@andywilliams.me>
Date:   Fri Jan 29 15:33:27 2016 +0000

    [toolbar] don't leak icons into the UI
    
    This cleans up orphan icons being left in the UI if you call icon_set
    after the toolbar has been displayed.
    
    This was most noticable if the toolbar or buttons move first
    
    @fix
---
 src/lib/elm_toolbar.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index a899bb9..bea4b56 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -2531,7 +2531,12 @@ _elm_toolbar_item_icon_obj_set(Evas_Object *obj,
         eina_stringshare_del(item->icon_str);
         item->icon_str = NULL;
      }
+   if (item->icon)
+     {
+        evas_object_del(item->icon);
+     }
    item->icon = icon_obj;
+
    if (icon_obj)
      {
         ms = (icon_size * elm_config_scale_get());

--