discomfitor pushed a commit to branch master.

commit d72411c6ea83d5921aa1676aa759c81f24158216
Author: discomfitor <[email protected]>
Date:   Sat May 18 14:12:44 2013 +0100

    make gadcon popup cleanup slightly more correct when deleting objects
---
 src/bin/e_gadcon_popup.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_gadcon_popup.c b/src/bin/e_gadcon_popup.c
index ba3aff3..4762948 100644
--- a/src/bin/e_gadcon_popup.c
+++ b/src/bin/e_gadcon_popup.c
@@ -49,7 +49,6 @@ _e_gadcon_popup_free(E_Gadcon_Popup *pop)
    if (pop->gadcon_was_locked)
      _e_gadcon_popup_locked_set(pop, 0);
    pop->gcc = NULL;
-   evas_object_del(pop->content);
    if (pop->win)
      E_OBJECT_DEL_SET(pop->win, NULL);
    E_FREE_FUNC(pop->win, e_object_del);
@@ -228,6 +227,8 @@ e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object 
*o)
                                        _e_gadcon_popup_changed_size_hints_cb, 
pop);
      }
    pop->content = o;
+   if (old_o) e_popup_object_remove(pop->win, old_o);
+   if (o) e_popup_object_add(pop->win, o);
    _e_gadcon_popup_size_recalc(pop, o);
 }
 

-- 

------------------------------------------------------------------------------
AlienVault Unified Security Management (USM) platform delivers complete
security visibility with the essential security capabilities. Easily and
efficiently configure, manage, and operate all of your security controls
from a single console and one unified framework. Download a free trial.
http://p.sf.net/sfu/alienvault_d2d

Reply via email to