hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=0c32a3fcf13f0c43747c478f012df259e987c156
commit 0c32a3fcf13f0c43747c478f012df259e987c156 Author: ChunEon Park <[email protected]> Date: Thu Mar 27 19:26:45 2014 +0900 Revert "key binding: define Elm_Action function as having a return type of Eina_Bool" This reverts commit f8d46bfca2a9285b45ec76062cd85b69dc86a7db. don't push any change except bug fix in window merge step 2 this patch will be pushed again. --- src/lib/elm_button.c | 6 ++---- src/lib/elm_config.c | 5 ++++- src/lib/elm_panel.c | 6 ++---- src/lib/elm_widget.h | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index b5c5f80..6a01208 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -41,7 +41,7 @@ static const Elm_Layout_Part_Alias_Description _text_aliases[] = {NULL, NULL} }; -static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params); +static void _key_action_activate(Evas_Object *obj, const char *params); static const Elm_Action key_actions[] = { {"activate", _key_action_activate}, @@ -156,12 +156,10 @@ _elm_button_elm_container_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, return EINA_TRUE; } -static Eina_Bool -_key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) +static void _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) { elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); _activate(obj); - return EINA_TRUE; } EOLIAN static Eina_Bool diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c index c8d6052..6eed719 100644 --- a/src/lib/elm_config.c +++ b/src/lib/elm_config.c @@ -2167,7 +2167,10 @@ _elm_config_key_binding_call(Evas_Object *obj, while (actions[i].name) { if (!strcmp(binding->action, actions[i].name)) - return actions[i].func(obj, binding->params); + { + actions[i].func(obj, binding->params); + return EINA_TRUE; + } i++; } break; diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c index c9fb2c8..8e9194f 100644 --- a/src/lib/elm_panel.c +++ b/src/lib/elm_panel.c @@ -20,7 +20,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {NULL, NULL} }; -static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params); +void _key_action_toggle(Evas_Object *obj, const char *params); static const Elm_Action key_actions[] = { {"toggle", _key_action_toggle}, @@ -237,11 +237,9 @@ _panel_toggle(void *data EINA_UNUSED, edje_object_message_signal_process(wd->resize_obj); } -static Eina_Bool -_key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED) +void _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED) { _panel_toggle(NULL, obj, NULL, NULL); - return EINA_TRUE; } EOLIAN static Eina_Bool diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h index 6f2b80e..da8c432 100644 --- a/src/lib/elm_widget.h +++ b/src/lib/elm_widget.h @@ -508,7 +508,7 @@ struct _Elm_Access_Info struct _Elm_Action { const char *name; - Eina_Bool (*func)(Evas_Object *obj, const char *params); + void (*func)(Evas_Object *obj, const char *params); }; void _elm_access_shutdown(); --
