From 664c3dc468159bbfcb74b74b3b2e83947718a5b0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 14 Jul 2017 18:44:22 -0400 Subject: [PATCH] move gadget del callbacks to AFTER priority ensure gadget internals have longer lifetime than external callbacks on gadget objects ref 27091c510cf22ba7b4b002cba872dca3f9022009 fix T5601, T5693 --- src/bin/e_gadget.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c index c57dcb6d5..f173cd70a 100644 --- a/src/bin/e_gadget.c +++ b/src/bin/e_gadget.c @@ -429,7 +429,7 @@ _gadget_object_create(E_Gadget_Config *zgc) if (!zgc->site->orient) evas_object_smart_need_recalculate_set(zgc->site->layout, 1); - evas_object_event_callback_priority_add(g, EVAS_CALLBACK_DEL, EVAS_CALLBACK_PRIORITY_BEFORE, _gadget_del, zgc); + evas_object_event_callback_priority_add(g, EVAS_CALLBACK_DEL, EVAS_CALLBACK_PRIORITY_AFTER, _gadget_del, zgc); _gadget_reparent(zgc->site, zgc); elm_object_tree_focus_allow_set(zgc->gadget, 0); evas_object_raise(zgc->site->events); @@ -1718,7 +1718,7 @@ e_gadget_util_layout_style_init(Evas_Object *g, Evas_Object *style) { elm_layout_file_get(style, NULL, &grp); eina_stringshare_replace(&zgc->style.name, strrchr(grp, '/') + 1); - evas_object_event_callback_priority_add(style, EVAS_CALLBACK_DEL, EVAS_CALLBACK_PRIORITY_BEFORE, _gadget_del, zgc); + evas_object_event_callback_priority_add(style, EVAS_CALLBACK_DEL, EVAS_CALLBACK_PRIORITY_AFTER, _gadget_del, zgc); } else eina_stringshare_replace(&zgc->style.name, NULL);