rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas_object_callbacks: do not error on NULL on del 

it does not really matter if a obj is NULL or not when deleting a callback.
The result might be NULL anyways when the callback is not found.
Additionally, this is very verbose, and leads to the fact that most of
the time normal calls to evas_object_event_callback_del* should be if
(!obj) evas_object_event_callback_del* which is annoying and wastefull.

Differential Revision: https://phab.enlightenment.org/D7028
This commit is contained in:
Marcel Hollerbach 2018-09-12 21:16:39 +02:00
parent fe036fd67f
commit 376b9985c3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/evas/canvas/evas_callbacks.c
View File

@ -503,7 +503,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
Evas_Object_Protected_Data *obj;
Evas_Event_Cb_Wrapper_Info *info;
EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
if (!eo_obj) return NULL;
EINA_SAFETY_ON_NULL_RETURN_VAL(func, NULL);
obj = efl_data_scope_safe_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@ -533,7 +533,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type
Evas_Object_Protected_Data *obj;
Evas_Event_Cb_Wrapper_Info *info;
EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
if (!eo_obj) return NULL;
EINA_SAFETY_ON_NULL_RETURN_VAL(func, NULL);
obj = efl_data_scope_safe_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);