discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5a2aab84572502b071d0cadce6869f86d3668e2e
commit 5a2aab84572502b071d0cadce6869f86d3668e2e Author: Mike Blumenkrantz <[email protected]> Date: Thu Jan 30 06:55:14 2014 -0500 reject stopping comp object effect if wrong end_cb is passed --- src/bin/e_comp_object.c | 3 ++- src/bin/e_comp_object.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 13095de..046bff6 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -3312,9 +3312,10 @@ e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void * } EAPI void -e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb EINA_UNUSED) +e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb) { API_ENTRY; + if (evas_object_data_get(cw->effect_obj, "_e_comp.end_cb") != end_cb) return; e_comp_object_effect_unclip(obj); if (cw->effect_clip) { diff --git a/src/bin/e_comp_object.h b/src/bin/e_comp_object.h index 23b29b2..34ebdc9 100644 --- a/src/bin/e_comp_object.h +++ b/src/bin/e_comp_object.h @@ -77,7 +77,7 @@ EAPI void e_comp_object_effect_params_set(Evas_Object *obj, int id, int *params, EAPI void e_comp_object_effect_clip(Evas_Object *obj); EAPI void e_comp_object_effect_unclip(Evas_Object *obj); EAPI void e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *end_data); -EAPI void e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb EINA_UNUSED); +EAPI void e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb); EAPI E_Comp_Object_Mover *e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb provider, const void *data); EAPI void e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov); --
