diff options
| author | Cedric Bail <cedric@osg.samsung.com> | 2017-08-12 10:27:01 -0700 |
|---|---|---|
| committer | Cedric Bail <cedric@osg.samsung.com> | 2017-08-13 13:18:08 -0700 |
| commit | a0ee90d9f30f71aa95d4d6503d17b1ac8165441d (patch) | |
| tree | 0d1493333621ddfcc1069991d76d8dcfc65a8408 | |
| parent | 87acc90fc770daa6c6fe43e237885d92b625637c (diff) | |
| download | efl-a0ee90d9f30f71aa95d4d6503d17b1ac8165441d.tar.gz | |
Revert "evas: we should be able to access this data during an object being destroyed."
This reverts commit 207cab086f290878cd584e6c61b3cd2696c5fd88.
Better make efl_data_scope_safe_get work during EFL_EVENT_DEL.
| -rw-r--r-- | src/lib/evas/canvas/evas_callbacks.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 1ed32e5ab9..184b500743 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -485,7 +485,7 @@ evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type EAPI void * evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Object_Event_Cb func) { - Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = efl_data_scope_safe_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); Evas_Event_Cb_Wrapper_Info *info; if (!obj) return NULL; @@ -512,7 +512,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva EAPI void * evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data) { - Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = efl_data_scope_safe_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); Evas_Event_Cb_Wrapper_Info *info; if (!obj) return NULL; @@ -568,7 +568,7 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb EAPI void * evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func) { - Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_safe_get(eo_e, EVAS_CANVAS_CLASS); Evas_Event_Cb_Wrapper_Info *info; if (!e) return NULL; @@ -595,7 +595,7 @@ evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func) EAPI void * evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data) { - Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_safe_get(eo_e, EVAS_CANVAS_CLASS); Evas_Event_Cb_Wrapper_Info *info; if (!e) return NULL; |