diff options
| author | Cedric BAIL <cedric@osg.samsung.com> | 2017-02-27 15:00:55 -0800 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2017-02-27 15:05:35 -0800 |
| commit | 30c5225bec62dff8f225d8e87fa64d0a78848ba1 (patch) | |
| tree | 392b26c00120b9e50fb98ad894769e5c96025806 | |
| parent | 5420ebaf3298a61f51a93a4ec01e5dda0f96698e (diff) | |
| download | efl-30c5225bec62dff8f225d8e87fa64d0a78848ba1.tar.gz | |
evas: properly disable Evas_Object event catching once we can't access Evas anymore.
| -rw-r--r-- | src/lib/evas/canvas/evas_callbacks.c | 6 | ||||
| -rw-r--r-- | src/lib/evas/canvas/evas_object_main.c | 1 | ||||
| -rw-r--r-- | src/lib/evas/include/evas_private.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 9bc736670b..e126d8d7f1 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -724,3 +724,9 @@ evas_object_callback_init(Efl_Canvas_Object *eo_obj, Evas_Object_Protected_Data { efl_event_callback_array_add(eo_obj, event_catcher_watch(), obj); } + +void +evas_object_callback_shutdown(Efl_Canvas_Object *eo_obj, Evas_Object_Protected_Data *obj) +{ + efl_event_callback_array_del(eo_obj, event_catcher_watch(), obj); +} diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index 0c64bf08df..adae7d5e74 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -397,6 +397,7 @@ evas_object_free(Evas_Object *eo_obj, Eina_Bool clean_layer) int was_smart_child = 0; + evas_object_callback_shutdown(eo_obj, obj); if (efl_isa(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS)) _evas_object_image_free(eo_obj); evas_object_map_set(eo_obj, NULL); diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h index 69e976c590..98d0c16d21 100644 --- a/src/lib/evas/include/evas_private.h +++ b/src/lib/evas/include/evas_private.h @@ -1636,6 +1636,7 @@ void evas_object_clip_across_clippees_check(Evas_Object *obj, Evas_Object_Protec void evas_object_mapped_clip_across_mark(Evas_Object *obj, Evas_Object_Protected_Data *pd); void evas_event_callback_call(Evas *e, Evas_Callback_Type type, void *event_info); void evas_object_callback_init(Efl_Canvas_Object *eo_obj, Evas_Object_Protected_Data *obj); +void evas_object_callback_shutdown(Efl_Canvas_Object *eo_obj, Evas_Object_Protected_Data *obj); void evas_object_event_callback_call(Evas_Object *obj, Evas_Object_Protected_Data *pd, Evas_Callback_Type type, void *event_info, int event_id, const Efl_Event_Description *efl_event_desc); Eina_List *evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y); int evas_mem_free(int mem_required); |