summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-05-29 09:29:45 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-29 12:29:04 -0400
commit282c7672f6c9d1940b57d1af803c8bd0dece59ac (patch)
tree2d761c932371c655318c097686268e1bd00c6eb7
parent3f3582af260d22c7434321b205f235294cb8f942 (diff)
elm/popup: remove del callback for internal table object during destruction
Summary: the table object's destruction is no longer relevant after this point and its callback can trigger unnecessary errors @fix Depends on D8986 Reviewers: cedric Reviewed By: cedric Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8988
-rw-r--r--src/lib/elementary/elc_popup.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 7cdf1edf0e..09527b28c2 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -234,7 +234,7 @@ _focus_changed_popup(void *data, const Efl_Event *ev)
234EFL_CALLBACKS_ARRAY_DEFINE(composition_cb, 234EFL_CALLBACKS_ARRAY_DEFINE(composition_cb,
235 { EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _focus_changed_popup }, 235 { EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _focus_changed_popup },
236) 236)
237 237static void _on_table_del(void *data, Evas *e, Evas_Object *obj, void *event_info);
238EOLIAN static void 238EOLIAN static void
239_elm_popup_efl_canvas_group_group_del(Eo *obj, Elm_Popup_Data *sd) 239_elm_popup_efl_canvas_group_group_del(Eo *obj, Elm_Popup_Data *sd)
240{ 240{
@@ -248,6 +248,9 @@ _elm_popup_efl_canvas_group_group_del(Eo *obj, Elm_Popup_Data *sd)
248 evas_object_event_callback_del 248 evas_object_event_callback_del
249 (sd->content, EVAS_CALLBACK_DEL, _on_content_del); 249 (sd->content, EVAS_CALLBACK_DEL, _on_content_del);
250 evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, _on_show); 250 evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, _on_show);
251 if (sd->tbl)
252 evas_object_event_callback_del_full(sd->tbl, EVAS_CALLBACK_DEL,
253 _on_table_del, obj);
251 efl_event_callback_array_del(sd->notify, composition_cb(), obj); 254 efl_event_callback_array_del(sd->notify, composition_cb(), obj);
252 255
253 sd->last_button_number = 0; 256 sd->last_button_number = 0;