[elm_bubble]content_unset bug fix

diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 95df88e..011ecfe 100755 (executable)
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -265,8 +265,8 @@ elm_bubble_content_unset(Evas_Object *obj)
    if (!wd) return NULL;
    if (!wd->content) return NULL;
    content = wd->content;
-   elm_widget_sub_object_del(obj, wd->content);
    edje_object_part_unswallow(wd->bbl, wd->content);
+   elm_widget_sub_object_del(obj, wd->content);
    wd->content = NULL;
    return content;
 }

diff --git a/src/lib/elm_datefield.c b/src/lib/elm_datefield.c
index 6f73c02..a132a92 100755 (executable)
--- a/src/lib/elm_datefield.c
+++ b/src/lib/elm_datefield.c
@@ -984,7 +984,7 @@ elm_datefield_input_panel_state_callback_add(Evas_Object *obj, void (*pEventCall
        if (wd->func && (wd->func != pEventCallbackFunc))
                elm_datefield_input_panel_state_callback_del(obj, wd->func);    
 
-       if (pEventCallbackFunc)
+       if (wd->func != pEventCallbackFunc)
        {
                wd->func = pEventCallbackFunc;
                wd->func_data = data;