rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=657b82aca4545c8d370369e76ead655567ec6c9d
commit 657b82aca4545c8d370369e76ead655567ec6c9d Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Mon Mar 14 08:54:41 2016 +0200 Move to Eo_event Change-Id: I1dd3e0ced8c79fe8f971e6fcaa6e5908bbc4c8c1 --- src/bin/common/validator.c | 7 ++----- src/bin/common/validator.h | 7 ++----- src/bin/ui/property_sound.c | 12 +++--------- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/bin/common/validator.c b/src/bin/common/validator.c index 462f322..0804a8b 100644 --- a/src/bin/common/validator.c +++ b/src/bin/common/validator.c @@ -81,13 +81,10 @@ resource_name_validator_status_get(Resource_Name_Validator *validator) } Eina_Bool -resource_name_validator_helper(void *data, - Eo *obj EINA_UNUSED, - const Eo_Event_Description *desc EINA_UNUSED, - void *event_info) +resource_name_validator_helper(void *data, const Eo_Event *event) { Resource *res; - Elm_Validate_Content *vc = event_info; + Elm_Validate_Content *vc = event->event_info; Resource_Name_Validator *validator = (Resource_Name_Validator *)data; assert(validator != NULL); diff --git a/src/bin/common/validator.h b/src/bin/common/validator.h index ea9d373..9273322 100644 --- a/src/bin/common/validator.h +++ b/src/bin/common/validator.h @@ -34,10 +34,7 @@ void resource_name_validator_free(Resource_Name_Validator *validator); Elm_Regexp_Status resource_name_validator_status_get(Resource_Name_Validator *validator); -Eina_Bool -resource_name_validator_helper(void *data, - Eo *obj EINA_UNUSED, - const Eo_Event_Description *desc EINA_UNUSED, - void *event_info); +EAPI Eina_Bool +resource_name_validator_helper(void *data, const Eo_Event *event); #endif /* VALIDATOR_H */ diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c index ca03320..5255d5f 100644 --- a/src/bin/ui/property_sound.c +++ b/src/bin/ui/property_sound.c @@ -221,10 +221,7 @@ _snd_file_tell(void *data, Eo *eo_obj EINA_UNUSED) #endif static Eina_Bool -_play_finished_cb(void *data, - Eo *in EINA_UNUSED, - const Eo_Event_Description *desc EINA_UNUSED, - void *event_info EINA_UNUSED) +_play_finished_cb(void *data, const Eo_Event *event __UNUSED__) { Sound_Prop_Data *edit = (Sound_Prop_Data *)data; @@ -238,12 +235,9 @@ _play_finished_cb(void *data, } static Eina_Bool -_out_fail(void *data EINA_UNUSED, - Eo *output, - const Eo_Event_Description *desc EINA_UNUSED, - void *event_info EINA_UNUSED) +_out_fail(void *data EINA_UNUSED, const Eo_Event *event) { - eo_del(output); + eo_del(event->obj); return true; } --