Revert "Revert "key binding: define Elm_Action function as having a return type of...

This reverts commit 0c32a3fcf13f0c43747c478f012df259e987c156.

now this can be pushed since second merge window for 1.10 is open

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 6a01208368cc9a62a5cb53442bc10a474ef704f7..b5c5f805517362b388c6ac14588716e6d0b57cd2 100644 (file)
--- 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 void _key_action_activate(Evas_Object *obj, const char *params);
+static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
 
 static const Elm_Action key_actions[] = {
    {"activate", _key_action_activate},
@@ -156,10 +156,12 @@ _elm_button_elm_container_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED,
    return EINA_TRUE;
 }
 
-static void _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
+static Eina_Bool
+_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 6eed719a3b315e54264826aea64e9d2ad8cb39cd..c8d6052773f714ac8de1d4c9fcd9295fba28a982 100644 (file)
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -2167,10 +2167,7 @@ _elm_config_key_binding_call(Evas_Object *obj,
                   while (actions[i].name)
                     {
                        if (!strcmp(binding->action, actions[i].name))
-                         {
-                            actions[i].func(obj, binding->params);
-                            return EINA_TRUE;
-                         }
+                         return actions[i].func(obj, binding->params);
                        i++;
                     }
                   break;

diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 8e9194fe589575fd6dc6658047983166de4da1e1..c9fb2c8467abbe404696a82d0a448257fe978df5 100644 (file)
--- 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}
 };
 
-void _key_action_toggle(Evas_Object *obj, const char *params);
+static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params);
 
 static const Elm_Action key_actions[] = {
    {"toggle", _key_action_toggle},
@@ -237,9 +237,11 @@ _panel_toggle(void *data EINA_UNUSED,
    edje_object_message_signal_process(wd->resize_obj);
 }
 
-void _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED)
+static Eina_Bool
+_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 da8c4324fc9ce678ec64635a29a114a0afd2a229..6f2b80e93a1e1ffaac5194cbcd57891ee57049bf 100644 (file)
--- 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;
-   void (*func)(Evas_Object *obj, const char *params);
+   Eina_Bool (*func)(Evas_Object *obj, const char *params);
 };
 
 void                  _elm_access_shutdown();