ctxpopup: fix elm_object_content_unset didn't unpack content from box

Reviewers: seoz

Reviewed By: seoz

Differential Revision: https://phab.enlightenment.org/D261

diff --git a/ChangeLog b/ChangeLog
index a9ab155e9674e27708c960f70608d9b6051a650f..7891a1bd9ed1e5c59937515baa87b0fd102677b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1680,3 +1680,6 @@
         handle styles at all (so styles were broken with the given
         namespace).
 
+2013-10-08  Daesung Kim (ad960009)
+
+        * ctxpopup : fix elm_object_content_unset didn't unpack content from box

diff --git a/NEWS b/NEWS
index e40f67478c12175c7c08be63029ba7fc4426c68f..bff325a7cc9127d126df4438c7112772c831b4b2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -296,6 +296,7 @@ Fixes:
    * Fix the layout to swallow the contents again when theme is changed.
    * elm_player breaks theme due to poor namespacing
    * elm_popup breaks theme due to poor namespacing
+   * ctxpopup: fix elm_object_content_unset didn't unpack content from box
 
 Removals:
 

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 32ad8a457c0d0b2050cdc24f45e4f24bac69eae9..4431cfa3f5d505ca11e4d1905533395220d6fe24 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -857,6 +857,7 @@ _elm_ctxpopup_smart_content_unset(Eo *obj, void *_pd, va_list *list)
    content = sd->content;
    if (!content) goto end;
 
+   elm_box_unpack(sd->box, content);
    sd->content = NULL;
    sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;