elm: Use appropriate add/del_full for evas event callbacks.

git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@64536 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c
index c5197f6..d104736 100644 (file)
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -22,6 +22,7 @@ struct _Widget_Data
 
 static const char *widtype = NULL;
 
+static void _del_pre_hook(Evas_Object *obj);
 static void _del_hook(Evas_Object *obj);
 static void _theme_hook(Evas_Object *obj);
 static void _disable_hook(Evas_Object *obj);
@@ -30,6 +31,9 @@ static void _changed_size_hints(void        *data,
                                 Evas        *e,
                                 Evas_Object *obj,
                                 void        *event_info);
+static void _button_clicked(void        *data,
+                            Evas_Object *obj,
+                            void        *event_info);
 static void _on_focus_hook(void        *data,
                            Evas_Object *obj);
 static void _selection_done(void        *data,
@@ -44,6 +48,16 @@ static const Evas_Smart_Cb_Description _signals[] = {
 };
 
 static void
+_del_pre_hook(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   evas_object_event_callback_del_full(wd->btn, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
+   evas_object_smart_callback_del(wd->btn, "clicked", _button_clicked);
+}
+
+static void
 _del_hook(Evas_Object *obj)
 {
    Evas_Object *win;
@@ -274,6 +288,7 @@ elm_fileselector_button_add(Evas_Object *parent)
    elm_widget_sub_object_add(parent, obj);
    elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
    elm_widget_data_set(obj, wd);
+   elm_widget_del_pre_hook_set(obj, _del_pre_hook);
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_theme_hook_set(obj, _theme_hook);
    elm_widget_disable_hook_set(obj, _disable_hook);

diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index 653ee49..bad2caf 100644 (file)
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -62,6 +62,8 @@ SIG_FWD(SELECTION_CUT)
 SIG_FWD(UNPRESSED)
 #undef SIG_FWD
 
+static void _del_pre_hook(Evas_Object *obj);
+static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl);
 
 static void
@@ -83,6 +85,17 @@ _ACTIVATED_fwd(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 }
 
 static void
+_del_pre_hook(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   evas_object_event_callback_del_full
+      (wd->button, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
+   evas_object_event_callback_del_full
+      (wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
+}
+
+static void
 _del_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -233,6 +246,7 @@ elm_fileselector_entry_add(Evas_Object *parent)
    elm_widget_type_set(obj, "fileselector_entry");
    elm_widget_sub_object_add(parent, obj);
    elm_widget_data_set(obj, wd);
+   elm_widget_del_pre_hook_set(obj, _del_pre_hook);
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_disable_hook_set(obj, _disable_hook);
    elm_widget_focus_next_hook_set(obj, _elm_fileselector_entry_focus_next_hook);

diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index e0b983c..6cb93e2 100644 (file)
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -49,6 +49,8 @@ _del_pre_hook(Evas_Object *obj)
    Elm_Hoversel_Item *item;
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
+   evas_object_event_callback_del_full(wd->btn, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
    elm_hoversel_hover_end(obj);
    elm_hoversel_hover_parent_set(obj, NULL);
    EINA_LIST_FREE(wd->items, item)

diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 44fb8b1..c80b232 100644 (file)
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -439,6 +439,8 @@ elm_bubble_content_unset(Evas_Object *obj)
    if (!wd->content) return NULL;
    content = wd->content;
    elm_widget_sub_object_del(obj, content);
+   evas_object_event_callback_del_full(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
    edje_object_part_unswallow(wd->bbl, content);
    wd->content = NULL;
    return content;
@@ -482,16 +484,16 @@ elm_bubble_sweep_layout_unset(Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
-   Evas_Object *sweep = NULL;
+   Evas_Object *icon = NULL;
    if (!wd) return NULL;
-#ifdef SWEEP_SUPPORT
-   if (!wd->sweep) return NULL;
-   sweep = wd->sweep;
-   edje_object_part_unswallow(wd->bbl, sweep);
-   evas_object_hide(sweep);
-   wd->sweep = NULL;
-#endif
-   return sweep;
+   if (!wd->icon) return NULL;
+   icon = wd->icon;
+   elm_widget_sub_object_del(obj, icon);
+   evas_object_event_callback_del_full(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
+   edje_object_part_unswallow(wd->bbl, icon);
+   wd->icon = NULL;
+   return icon;
 }
 
 EAPI void

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 1976ff4..aa40546 100644 (file)
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -248,6 +248,8 @@ _content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
    if (!wd->icon) return NULL;
    Evas_Object *icon = wd->icon;
    elm_widget_sub_object_del(obj, wd->icon);
+   evas_object_event_callback_del_full(wd->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
    edje_object_part_unswallow(wd->btn, wd->icon);
    wd->icon = NULL;
    return icon;

diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index 9ce3e65..cfc4049 100644 (file)
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -269,6 +269,9 @@ _content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
    if (!wd->icon) return NULL;
    Evas_Object *icon = wd->icon;
    elm_widget_sub_object_del(obj, wd->icon);
+   evas_object_event_callback_del_full(wd->icon,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
    edje_object_part_unswallow(wd->chk, wd->icon);
    wd->icon = NULL;
    return icon;

diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index c9fe3f8..e9f0255 100644 (file)
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -163,6 +163,9 @@ _content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
    if ((!wd) || (!wd->content)) return NULL;
    content = wd->content;
    elm_widget_sub_object_del(obj, wd->content);
+   evas_object_event_callback_del_full(wd->content,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
    edje_object_part_unswallow(wd->base, wd->content);
    wd->content = NULL;
    return content;

diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index 89f47b7..94a7bf2 100644 (file)
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -1721,6 +1721,9 @@ elm_flip_content_front_unset(Evas_Object *obj)
    Evas_Object *content = wd->front.content;
    evas_object_clip_unset(content);
    elm_widget_sub_object_del(obj, content);
+   evas_object_event_callback_del_full(content,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
    evas_object_smart_member_del(content);
    wd->front.content = NULL;
    return content;
@@ -1736,6 +1739,9 @@ elm_flip_content_back_unset(Evas_Object *obj)
    Evas_Object *content = wd->back.content;
    evas_object_clip_unset(content);
    elm_widget_sub_object_del(obj, content);
+   evas_object_event_callback_del_full(content,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
    evas_object_smart_member_del(content);
    wd->back.content = NULL;
    return content;

diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index fb1019c..7dae02b 100644 (file)
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -162,6 +162,9 @@ _content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
    if (!wd->content) return NULL;
    content = wd->content;
    elm_widget_sub_object_del(obj, wd->content);
+   evas_object_event_callback_del_full(wd->content,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
    edje_object_part_unswallow(wd->frm, wd->content);
    wd->content = NULL;
    return content;

diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 50ab840..4986075 100644 (file)
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -424,6 +424,9 @@ _content_unset_hook(Evas_Object *obj, const char *part)
              if (!si->obj) return NULL;
              content = si->obj; /* si will die in _sub_del due elm_widget_sub_object_del() */
              elm_widget_sub_object_del(obj, content);
+             evas_object_event_callback_del_full(content,
+                                                 EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                                 _changed_size_hints, wd);
              edje_object_part_unswallow(wd->lay, content);
              return content;
           }

diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index ab6f152..9e01249 100644 (file)
--- a/src/lib/elm_mapbuf.c
+++ b/src/lib/elm_mapbuf.c
@@ -191,6 +191,9 @@ _content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
    if (!wd->content) return NULL;
    content = wd->content;
    elm_widget_sub_object_del(obj, content);
+   evas_object_event_callback_add(content,
+                                  EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                  _changed_size_hints, obj);
    evas_object_smart_member_del(content);
    evas_object_color_set(wd->clip, 0, 0, 0, 0);
    evas_object_clip_unset(content);

diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 85acf1e..2c04a67 100644 (file)
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -456,6 +456,11 @@ _content_unset_hook(Evas_Object *obj, const char *part __UNUSED__)
    if (!wd->content) return NULL;
    content = wd->content;
    elm_widget_sub_object_del(obj, wd->content);
+   evas_object_event_callback_del_full(wd->content,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
+   evas_object_event_callback_del_full(wd->content, EVAS_CALLBACK_RESIZE,
+                                       _content_resize, obj);
    edje_object_part_unswallow(wd->notify, wd->content);
    wd->content = NULL;
    return content;

diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 3e26744..349be03 100644 (file)
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -39,6 +39,7 @@ struct _Widget_Data
 };
 
 static const char *widtype = NULL;
+static void _del_pre_hook(Evas_Object *obj);
 static void _del_hook(Evas_Object *obj);
 static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl);
 static void _theme_hook(Evas_Object *obj);
@@ -98,6 +99,15 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
 }
 
 static void
+_del_pre_hook(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   evas_object_event_callback_del_full(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
+}
+
+static void
 _del_hook(Evas_Object *obj)
 {
    const char *layout;
@@ -340,6 +350,7 @@ elm_slideshow_add(Evas_Object *parent)
    elm_widget_sub_object_add(parent, obj);
    elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
    elm_widget_data_set(obj, wd);
+   elm_widget_del_pre_hook_set(obj, _del_pre_hook);
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_theme_hook_set(obj, _theme_hook);
    elm_widget_can_focus_set(obj, EINA_TRUE);

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 1f63a4a..4b159c0 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2622,6 +2622,9 @@ elm_win_inwin_content_unset(Evas_Object *obj)
    if (!wd->content) return NULL;
    Evas_Object *content = wd->content;
    elm_widget_sub_object_del(obj, wd->content);
+   evas_object_event_callback_del_full(wd->content,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
    edje_object_part_unswallow(wd->frm, wd->content);
    wd->content = NULL;
    return content;