summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2014-03-27 19:26:45 +0900
committerChunEon Park <hermet@hermet.pe.kr>2014-03-27 19:26:45 +0900
commit0c32a3fcf13f0c43747c478f012df259e987c156 (patch)
treee6c634f4ace6329ec3a965db40b7559fd5a58e6e
parent8ac522691b75fe9001b91b0fcd6ed844241ea7b5 (diff)
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.
-rw-r--r--src/lib/elm_button.c6
-rw-r--r--src/lib/elm_config.c5
-rw-r--r--src/lib/elm_panel.c6
-rw-r--r--src/lib/elm_widget.h2
4 files changed, 9 insertions, 10 deletions
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index b5c5f8055..6a0120836 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[] =
41 {NULL, NULL} 41 {NULL, NULL}
42}; 42};
43 43
44static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params); 44static void _key_action_activate(Evas_Object *obj, const char *params);
45 45
46static const Elm_Action key_actions[] = { 46static const Elm_Action key_actions[] = {
47 {"activate", _key_action_activate}, 47 {"activate", _key_action_activate},
@@ -156,12 +156,10 @@ _elm_button_elm_container_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED,
156 return EINA_TRUE; 156 return EINA_TRUE;
157} 157}
158 158
159static Eina_Bool 159static void _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
160_key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
161{ 160{
162 elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); 161 elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
163 _activate(obj); 162 _activate(obj);
164 return EINA_TRUE;
165} 163}
166 164
167EOLIAN static Eina_Bool 165EOLIAN static Eina_Bool
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index c8d605277..6eed719a3 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,
2167 while (actions[i].name) 2167 while (actions[i].name)
2168 { 2168 {
2169 if (!strcmp(binding->action, actions[i].name)) 2169 if (!strcmp(binding->action, actions[i].name))
2170 return actions[i].func(obj, binding->params); 2170 {
2171 actions[i].func(obj, binding->params);
2172 return EINA_TRUE;
2173 }
2171 i++; 2174 i++;
2172 } 2175 }
2173 break; 2176 break;
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index c9fb2c846..8e9194fe5 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[] = {
20 {NULL, NULL} 20 {NULL, NULL}
21}; 21};
22 22
23static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params); 23void _key_action_toggle(Evas_Object *obj, const char *params);
24 24
25static const Elm_Action key_actions[] = { 25static const Elm_Action key_actions[] = {
26 {"toggle", _key_action_toggle}, 26 {"toggle", _key_action_toggle},
@@ -237,11 +237,9 @@ _panel_toggle(void *data EINA_UNUSED,
237 edje_object_message_signal_process(wd->resize_obj); 237 edje_object_message_signal_process(wd->resize_obj);
238} 238}
239 239
240static Eina_Bool 240void _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED)
241_key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED)
242{ 241{
243 _panel_toggle(NULL, obj, NULL, NULL); 242 _panel_toggle(NULL, obj, NULL, NULL);
244 return EINA_TRUE;
245} 243}
246 244
247EOLIAN static Eina_Bool 245EOLIAN static Eina_Bool
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 6f2b80e93..da8c4324f 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -508,7 +508,7 @@ struct _Elm_Access_Info
508struct _Elm_Action 508struct _Elm_Action
509{ 509{
510 const char *name; 510 const char *name;
511 Eina_Bool (*func)(Evas_Object *obj, const char *params); 511 void (*func)(Evas_Object *obj, const char *params);
512}; 512};
513 513
514void _elm_access_shutdown(); 514void _elm_access_shutdown();