rimmed pushed a commit to branch eflete-0.6.1. http://git.enlightenment.org/tools/eflete.git/commit/?id=2ba2e067ec8784a71e1096494dceedefaa0b874a
commit 2ba2e067ec8784a71e1096494dceedefaa0b874a Author: Vyacheslav Reutskiy <[email protected]> Date: Mon Mar 21 16:43:47 2016 +0200 Revert "Move to Eo_event" Downground the efl usage (means Eo) for run to efl v1.17.0 This reverts commit 657b82aca4545c8d370369e76ead655567ec6c9d. --- src/bin/common/validator.c | 7 +++++-- src/bin/common/validator.h | 7 +++++-- src/bin/ui/property_sound.c | 12 +++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/bin/common/validator.c b/src/bin/common/validator.c index 0804a8b..462f322 100644 --- a/src/bin/common/validator.c +++ b/src/bin/common/validator.c @@ -81,10 +81,13 @@ resource_name_validator_status_get(Resource_Name_Validator *validator) } Eina_Bool -resource_name_validator_helper(void *data, const Eo_Event *event) +resource_name_validator_helper(void *data, + Eo *obj EINA_UNUSED, + const Eo_Event_Description *desc EINA_UNUSED, + void *event_info) { Resource *res; - Elm_Validate_Content *vc = event->event_info; + Elm_Validate_Content *vc = 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 9273322..ea9d373 100644 --- a/src/bin/common/validator.h +++ b/src/bin/common/validator.h @@ -34,7 +34,10 @@ void resource_name_validator_free(Resource_Name_Validator *validator); Elm_Regexp_Status resource_name_validator_status_get(Resource_Name_Validator *validator); -EAPI Eina_Bool -resource_name_validator_helper(void *data, const Eo_Event *event); +Eina_Bool +resource_name_validator_helper(void *data, + Eo *obj EINA_UNUSED, + const Eo_Event_Description *desc EINA_UNUSED, + void *event_info); #endif /* VALIDATOR_H */ diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c index 5255d5f..ca03320 100644 --- a/src/bin/ui/property_sound.c +++ b/src/bin/ui/property_sound.c @@ -221,7 +221,10 @@ _snd_file_tell(void *data, Eo *eo_obj EINA_UNUSED) #endif static Eina_Bool -_play_finished_cb(void *data, const Eo_Event *event __UNUSED__) +_play_finished_cb(void *data, + Eo *in EINA_UNUSED, + const Eo_Event_Description *desc EINA_UNUSED, + void *event_info EINA_UNUSED) { Sound_Prop_Data *edit = (Sound_Prop_Data *)data; @@ -235,9 +238,12 @@ _play_finished_cb(void *data, const Eo_Event *event __UNUSED__) } static Eina_Bool -_out_fail(void *data EINA_UNUSED, const Eo_Event *event) +_out_fail(void *data EINA_UNUSED, + Eo *output, + const Eo_Event_Description *desc EINA_UNUSED, + void *event_info EINA_UNUSED) { - eo_del(event->obj); + eo_del(output); return true; } --
