diff options
| author | Tom Hacohen <tom@stosb.com> | 2016-06-20 15:31:31 +0100 |
|---|---|---|
| committer | Tom Hacohen <tom@stosb.com> | 2016-06-20 18:02:00 +0100 |
| commit | 6202cc7485a54dea6f02a2668e7c907247902dd1 (patch) | |
| tree | 7a1fa2b61175b1ef75a9bff7299a0ce3daa45216 /src | |
| parent | d648eb5311585f7392d0290640ba133814b52589 (diff) | |
| download | efl-6202cc7485a54dea6f02a2668e7c907247902dd1.tar.gz | |
Adjust the code according to the eo event stop changes.
This was changed in the previous commit.
Diffstat (limited to 'src')
120 files changed, 665 insertions, 1188 deletions
diff --git a/src/benchmarks/eo/eo_bench_callbacks.c b/src/benchmarks/eo/eo_bench_callbacks.c index cb0fc0e126..69ea71e4e3 100644 --- a/src/benchmarks/eo/eo_bench_callbacks.c +++ b/src/benchmarks/eo/eo_bench_callbacks.c @@ -6,10 +6,9 @@ #include "eo_bench.h" #include "class_simple.h" -static Eina_Bool +static void _cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { - return EO_CALLBACK_CONTINUE; } diff --git a/src/bin/elementary/test_anim.c b/src/bin/elementary/test_anim.c index e5d97c2caf..0cb608d881 100644 --- a/src/bin/elementary/test_anim.c +++ b/src/bin/elementary/test_anim.c @@ -10,7 +10,7 @@ static const char *names[] = "bub3", "sh3", }; -static Eina_Bool +static void _anim_tick(void *data EINA_UNUSED, const Eo_Event *event) { Evas_Object *bub, *sh; @@ -49,7 +49,6 @@ _anim_tick(void *data EINA_UNUSED, const Eo_Event *event) evas_object_move(sh, x, y); evas_object_resize(sh, w, h); } - return ECORE_CALLBACK_RENEW; } void diff --git a/src/bin/elementary/test_application_server.c b/src/bin/elementary/test_application_server.c index f2b5cf0a66..7e89319e32 100644 --- a/src/bin/elementary/test_application_server.c +++ b/src/bin/elementary/test_application_server.c @@ -39,25 +39,23 @@ _window_create(App_View_Context *ctx) evas_object_show(ctx->win); } -static Eina_Bool +static void _close_cb(void *data, const Eo_Event *event) { App_View_Context *ctx = data; if (ctx->win) evas_object_del(ctx->win); eo_del(event->object); - return EINA_TRUE; } -static Eina_Bool +static void _pause_cb(void *data, const Eo_Event *event EINA_UNUSED) { App_View_Context *ctx = data; _text_update(ctx, "paused"); - return EINA_TRUE; } -static Eina_Bool +static void _resume_cb(void *data, const Eo_Event *event) { App_View_Context *ctx = data; @@ -70,10 +68,9 @@ _resume_cb(void *data, const Eo_Event *event) } _text_update(ctx, "alive"); - return EINA_TRUE; } -static Eina_Bool +static void _view_del_cb(void *data, const Eo_Event *event) { App_View_Context *ctx = data; @@ -83,7 +80,6 @@ _view_del_cb(void *data, const Eo_Event *event) elm_app_server_view_window_set(event->object, NULL); eina_stringshare_del(ctx->view_name); free(ctx); - return EINA_TRUE; } static Elm_App_Server_View * @@ -120,7 +116,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED, return view; } -static Eina_Bool +static void _terminate_cb(void *data EINA_UNUSED, const Eo_Event *event) { const char *title = NULL; @@ -131,7 +127,6 @@ _terminate_cb(void *data EINA_UNUSED, const Eo_Event *event) printf("Closing: %s\n", title); eo_unref(event->object); - return EINA_TRUE; } Elm_App_Server * @@ -167,12 +162,11 @@ test_application_server_common(const char *pkg) return server; } -static Eina_Bool +static void _server_del_cb(void *data, const Eo_Event *event EINA_UNUSED) { Elm_App_Server **server = data; *server = NULL; - return EINA_TRUE; } void diff --git a/src/bin/elementary/test_code.c b/src/bin/elementary/test_code.c index ed2d7ad765..66fee91e81 100644 --- a/src/bin/elementary/test_code.c +++ b/src/bin/elementary/test_code.c @@ -23,7 +23,7 @@ static void _append_line(Elm_Code_File *file, const char *line) elm_code_file_line_append(file, line, length, NULL); } -static Eina_Bool +static void _elm_code_test_line_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event) { Elm_Code_Line *line; @@ -31,10 +31,9 @@ _elm_code_test_line_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event) line = (Elm_Code_Line *)event->info; printf("CLICKED line %d\n", line->number); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _elm_code_test_line_done_cb(void *data EINA_UNUSED, const Eo_Event *event) { Elm_Code_Line *line; @@ -46,7 +45,7 @@ _elm_code_test_line_done_cb(void *data EINA_UNUSED, const Eo_Event *event) else if (line->number == 4) line->status = ELM_CODE_STATUS_TYPE_ERROR; - return EO_CALLBACK_STOP; + eo_event_callback_stop(event->object); } static Evas_Object * diff --git a/src/bin/elementary/test_entry.c b/src/bin/elementary/test_entry.c index 5077d37074..c56e093be2 100644 --- a/src/bin/elementary/test_entry.c +++ b/src/bin/elementary/test_entry.c @@ -358,13 +358,12 @@ _end_hide_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU elm_entry_end_visible_set(en, EINA_FALSE); } -static Eina_Bool +static void _context_menu_show_cb(void *data EINA_UNUSED, const Eo_Event *event) { elm_entry_context_menu_clear(event->object); elm_entry_context_menu_item_add(event->object, "MenuD1", NULL, ELM_ICON_NONE, _item_cb, NULL); elm_entry_context_menu_item_add(event->object, "MenuD2", NULL, ELM_ICON_NONE, _item_cb, NULL); - return EO_CALLBACK_CONTINUE; } void diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c index dafdeef381..5ae64ed60e 100644 --- a/src/bin/elementary/test_events.c +++ b/src/bin/elementary/test_events.c @@ -17,36 +17,33 @@ typedef struct { Eo *timer; } testdata; -static Eina_Bool +static void _pointer_down(void *data, const Eo_Event *ev) { testdata *td = data; td->down = 1; eo_del(td->evdown); td->evdown = efl_event_dup(ev->info); - return 1; } -static Eina_Bool +static void _pointer_move(void *data, const Eo_Event *ev) { testdata *td = data; eo_del(td->evmove); td->evmove = efl_event_dup(ev->info); - return 1; } -static Eina_Bool +static void _pointer_up(void *data, const Eo_Event *ev) { testdata *td = data; td->down = 0; eo_del(td->evup); td->evup = efl_event_dup(ev->info); - return 1; } -static Eina_Bool +static void _key_down(void *data, const Eo_Event *ev) { testdata *td = data; @@ -70,8 +67,6 @@ _key_down(void *data, const Eo_Event *ev) eo_del(td->evkeydown); td->evkeydown = efl_event_dup(ev->info); } - - return 1; } #if 0 @@ -96,7 +91,7 @@ _ecore_timeout_cb(void *data) #endif -static Eina_Bool +static void _key_up(void *data, const Eo_Event *ev) { testdata *td = data; @@ -115,11 +110,9 @@ _key_up(void *data, const Eo_Event *ev) if (td->timer) eo_del(td->timer); td->timer = ecore_timer_add(0.5, _ecore_timeout_cb, td); - - return 1; } -static Eina_Bool +static void _clicked_button1(void *data, const Eo_Event *ev EINA_UNUSED) { testdata *td = data; @@ -131,11 +124,9 @@ _clicked_button1(void *data, const Eo_Event *ev EINA_UNUSED) td->id++; sprintf(buf, "Button was clicked %d time%s", td->id, td->id > 1 ? "s" : ""); elm_object_text_set(txt, buf); - - return 1; } -static Eina_Bool +static void _clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED) { testdata *td = data; @@ -166,16 +157,13 @@ _clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED) td->evkeydown = NULL; td->evkeyup = NULL; } - - return 1; } -static Eina_Bool +static void _win_del(void *data, const Eo_Event *ev EINA_UNUSED) { testdata *td = data; free(td); - return 1; } EO_CALLBACKS_ARRAY_DEFINE(rect_pointer_callbacks, diff --git a/src/bin/elementary/test_grid_static.c b/src/bin/elementary/test_grid_static.c index 0cb89360c7..2e1ac8922a 100644 --- a/src/bin/elementary/test_grid_static.c +++ b/src/bin/elementary/test_grid_static.c @@ -64,7 +64,7 @@ set_api_state(api_data *api) } } -static Eina_Bool +static void _api_bt_clicked(void *data, const Eo_Event *ev) { /* Will add here a SWITCH command containing code to modify test-object */ /* in accordance a->state value. */ @@ -77,10 +77,9 @@ _api_bt_clicked(void *data, const Eo_Event *ev) sprintf(str, "Next API function (%u)", a->state); elm_object_text_set(ev->object, str); elm_object_disabled_set(ev->object, a->state == API_STATE_LAST); - return 1; } -static Eina_Bool +static void _ch_grid(void *data, const Eo_Event *ev) { Eo *gd = data; @@ -91,14 +90,12 @@ _ch_grid(void *data, const Eo_Event *ev) //elm_grid_pack_set(obj, x - 1, y - 1, w + 2, h + 2); efl_pack_grid_position_get(gd, ev->object, &x, &y, &w, &h); efl_pack_grid(gd, ev->object, x - 1, y - 1, w + 2, h + 2); - return 1; } -static Eina_Bool +static void _win_del(void *data, const Eo_Event *ev EINA_UNUSED) { free(data); - return 1; } void diff --git a/src/bin/elementary/test_task_switcher.c b/src/bin/elementary/test_task_switcher.c index 8133b7ff15..09380a1401 100644 --- a/src/bin/elementary/test_task_switcher.c +++ b/src/bin/elementary/test_task_switcher.c @@ -33,7 +33,7 @@ static void _btn_resume_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event elm_app_client_view_resume(view, NULL, NULL); } -static Eina_Bool +static void _app_view_prop_changed_cb(void *data EINA_UNUSED, const Eo_Event *event) { Elm_App_View_State state = ELM_APP_VIEW_STATE_UNKNOWN; @@ -48,8 +48,6 @@ _app_view_prop_changed_cb(void *data EINA_UNUSED, const Eo_Event *event) } else _app_view_clicked(event->object, NULL, NULL); - - return EINA_TRUE; } static void @@ -270,12 +268,11 @@ _app_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU elm_list_go(views); } -static Eina_Bool +static void _view_list_update_cb(void *data EINA_UNUSED, const Eo_Event *event) { if (app_selected == event->object) _app_clicked(event->object, NULL, NULL); - return EINA_TRUE; } static void diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c index bee74331df..7c83b4adf7 100644 --- a/src/bin/elementary/test_ui_box.c +++ b/src/bin/elementary/test_ui_box.c @@ -18,7 +18,7 @@ typedef enum { TWO } Weight_Mode; -static Eina_Bool +static void weights_cb(void *data, const Eo_Event *event) { Weight_Mode mode = elm_radio_state_value_get(event->object); @@ -58,92 +58,81 @@ weights_cb(void *data, const Eo_Event *event) efl_gfx_size_hint_weight_set(objects[i], 0, 0); break; } - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void user_min_slider_cb(void *data EINA_UNUSED, const Eo_Event *event) { int val = elm_slider_value_get(event->object); efl_gfx_size_hint_min_set(objects[3], val, val); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void padding_slider_cb(void *data, const Eo_Event *event) { int val = elm_slider_value_get(event->object); efl_pack_padding_set(data, val, val, EINA_TRUE); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void margin_slider_cb(void *data, const Eo_Event *event) { int val = elm_slider_value_get(event->object); efl_gfx_size_hint_margin_set(data, val, val, val, val); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void alignh_slider_cb(void *data, const Eo_Event *event) { double av, val; val = elm_slider_value_get(event->object); efl_pack_align_get(data, NULL, &av); efl_pack_align_set(data, val, av); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void alignv_slider_cb(void *data, const Eo_Event *event) { double ah, val; val = elm_slider_value_get(event->object); efl_pack_align_get(data, &ah, NULL); efl_pack_align_set(data, ah, val); - return EO_CALLBACK_CONTINUE; } static Efl_Ui_Box_Flow_Params s_flow_params = { 0, 0 }; static Eina_Bool flow = EINA_FALSE; -static Eina_Bool +static void flow_check_cb(void *data, const Eo_Event *event) { flow = elm_check_selected_get(event->object); efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void horiz_check_cb(void *data, const Eo_Event *event) { Eina_Bool chk = elm_check_selected_get(event->object); efl_orientation_set(data, chk ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void homo_check_cb(void *data, const Eo_Event *event) { Eina_Bool chk = elm_check_selected_get(event->object); s_flow_params.homogenous = chk; efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void max_size_check_cb(void *data, const Eo_Event *event) { Eina_Bool chk = elm_check_selected_get(event->object); s_flow_params.max_size = chk; efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void left_check_cb(void *data, const Eo_Event *event) { Eina_Bool chk = elm_check_selected_get(event->object); @@ -155,7 +144,6 @@ left_check_cb(void *data, const Eo_Event *event) { efl_pack_align_set(data, 0.5, 0.5); } - return EO_CALLBACK_CONTINUE; } static void @@ -197,12 +185,11 @@ static const Eo_Class_Description custom_engine_class_desc = { EO_DEFINE_CLASS(_test_ui_box_custom_engine_class_get, &custom_engine_class_desc, EFL_PACK_LAYOUT_INTERFACE, NULL) -static Eina_Bool +static void custom_check_cb(void *data, const Eo_Event *event) { Eina_Bool chk = elm_check_selected_get(event->object); efl_pack_layout_engine_set(data, chk ? _test_ui_box_custom_engine_class_get() : NULL, NULL); - return EO_CALLBACK_CONTINUE; } void diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c index 99e263dc78..55a2d79c08 100644 --- a/src/bin/elementary/test_ui_grid.c +++ b/src/bin/elementary/test_ui_grid.c @@ -32,7 +32,7 @@ EO_DEFINE_CLASS(_test_ui_grid_custom_engine_class_get, &custom_engine_class_desc #define CUSTOM_ENGINE_CLASS _test_ui_grid_custom_engine_class_get() -static Eina_Bool +static void weights_cb(void *data, const Eo_Event *event) { Weight_Mode mode = elm_radio_state_value_get(event->object); @@ -75,45 +75,39 @@ weights_cb(void *data, const Eo_Event *event) efl_pack_layout_engine_set(grid, CUSTOM_ENGINE_CLASS, NULL); break; } - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void user_min_slider_cb(void *data EINA_UNUSED, const Eo_Event *event) { int val = elm_slider_value_get(event->object); for (int i = 0; i < 6; i++) efl_gfx_size_hint_min_set(objects[i], val, val); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void padding_slider_cb(void *data, const Eo_Event *event) { int val = elm_slider_value_get(event->object); efl_pack_padding_set(data, val, val, EINA_TRUE); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void margin_slider_cb(void *data, const Eo_Event *event) { int val = elm_slider_value_get(event->object); efl_gfx_size_hint_margin_set(data, val, val, val, val); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void btnmargins_slider_cb(void *data, const Eo_Event *event) { int val = elm_slider_value_get(event->object); for (int i = 1; i < 7; i++) efl_gfx_size_hint_margin_set(data, val, val, val, val); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void layout_updated_cb(void *data, const Eo_Event *event) { Elm_Label *o = data; @@ -124,11 +118,9 @@ layout_updated_cb(void *data, const Eo_Event *event) count = efl_content_count(event->object); sprintf(buf, "%d items (%dx%d)", count, cols, rows); elm_object_text_set(o, buf); - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void child_evt_cb(void *data, const Eo_Event *event) { Elm_Label *o = data; @@ -142,8 +134,6 @@ child_evt_cb(void *data, const Eo_Event *event) else sprintf(buf, "unpack %d,%d %dx%d", col, row, colspan, rowspan); elm_object_text_set(o, buf); - - return EO_CALLBACK_CONTINUE; } static void @@ -498,14 +488,13 @@ btn_text(const char *str) return buf; } -static Eina_Bool +static void remove_cb(void *data EINA_UNUSED, const Eo_Event *ev) { eo_del(ev->object); - return 1; } -static Eina_Bool +static void append_cb(void *data, const Eo_Event *ev EINA_UNUSED) { Eo *grid = data; @@ -515,15 +504,13 @@ append_cb(void *data, const Eo_Event *ev EINA_UNUSED) elm_object_tooltip_text_set(o, "Click to unpack"); efl_pack_end(grid, o); efl_gfx_visible_set(o, 1); - return 1; } -static Eina_Bool +static void clear_cb(void *data, const Eo_Event *ev EINA_UNUSED) { Eo *grid = data; efl_pack_clear(grid); - return 1; } void diff --git a/src/bin/elementary/test_win_plug.c b/src/bin/elementary/test_win_plug.c index 2794bb3982..4f28f24327 100644 --- a/src/bin/elementary/test_win_plug.c +++ b/src/bin/elementary/test_win_plug.c @@ -143,11 +143,11 @@ create_handles(Evas_Object *obj) } } -static Eina_Bool +static void _notify_end(void *data EINA_UNUSED, const Eo_Event *event) { eo_del(event->object); - return EINA_FALSE; + eo_event_callback_stop(event->object); } static inline void diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c index 29be761f72..0b1ea08e64 100644 --- a/src/examples/ecore/ecore_audio_playback.c +++ b/src/examples/ecore/ecore_audio_playback.c @@ -191,7 +191,7 @@ handle_input(void *data EINA_UNUSED, Ecore_Fd_Handler *handler) return EINA_TRUE; } -static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event) +static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event) { const char *name; Eina_Bool ret; diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c index a9451eab0e..2e1e92c366 100644 --- a/src/examples/ecore/ecore_audio_to_ogg.c +++ b/src/examples/ecore/ecore_audio_to_ogg.c @@ -15,7 +15,7 @@ double volume = 1; Eina_List *inputs = NULL; -static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event) +static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event) { const char *name; Eo *out; diff --git a/src/examples/eio/eio_sentry.c b/src/examples/eio/eio_sentry.c index f48ee4643c..29529025d3 100644 --- a/src/examples/eio/eio_sentry.c +++ b/src/examples/eio/eio_sentry.c @@ -10,7 +10,7 @@ #include <Eio.h> #include <Ecore.h> -Eina_Bool +void sentry_cb(void *data EINA_UNUSED, const Eo_Event *event) { Eio_Sentry_Event *event_info = event->info; @@ -20,7 +20,7 @@ sentry_cb(void *data EINA_UNUSED, const Eo_Event *event) ecore_main_loop_quit(); - return EINA_FALSE; + eo_event_callback_stop(event->object); } void diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c index f4d7890578..09950214a9 100644 --- a/src/examples/elementary/filemvc.c +++ b/src/examples/elementary/filemvc.c @@ -46,7 +46,7 @@ _filter_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, const Eina_Fil return EINA_FALSE; } -static Eina_Bool +static void _list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event) { Efl_Model_Test_Filemvc_Data *priv = data; @@ -55,7 +55,6 @@ _list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event) printf("LIST selected model\n"); elm_view_form_model_set(priv->formview, child); - return EINA_TRUE; } static void @@ -75,7 +74,7 @@ _promise_error(void *data, const Eina_Error err) { } -static Eina_Bool +static void _tree_selected_cb(void *data, const Eo_Event *event) { Efl_Model_Test_Filemvc_Data *priv = data; @@ -86,7 +85,6 @@ _tree_selected_cb(void *data, const Eo_Event *event) promise= efl_model_property_get(child, "path"); eina_promise_then(promise, &_promise_then, &_promise_error, priv); - return EINA_TRUE; } static void diff --git a/src/examples/emotion/emotion_basic_example.c b/src/examples/emotion/emotion_basic_example.c index 7b6ce436a1..7f14486807 100644 --- a/src/examples/emotion/emotion_basic_example.c +++ b/src/examples/emotion/emotion_basic_example.c @@ -14,12 +14,10 @@ #define WIDTH (320) #define HEIGHT (240) -static Eina_Bool +static void _playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) { printf("Emotion object started playback.\n"); - - return EINA_TRUE; } int diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c index 67c43a9efd..e106a11c2f 100644 --- a/src/examples/emotion/emotion_border_example.c +++ b/src/examples/emotion/emotion_border_example.c @@ -17,12 +17,10 @@ static Eina_List *filenames = NULL; static Eina_List *curfile = NULL; -static Eina_Bool +static void _playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) { printf("Emotion object started playback.\n"); - - return EINA_TRUE; } static Evas_Object * @@ -107,48 +105,38 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void * } } -static Eina_Bool +static void _frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) { // fprintf(stderr, "smartcb: frame_decode\n"); - - return EINA_TRUE; } -static Eina_Bool +static void _length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) { fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object)); - - return EINA_TRUE; } -static Eina_Bool +static void _position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) { fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object)); - - return EINA_TRUE; } -static Eina_Bool +static void _progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) { fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n", emotion_object_progress_status_get(ev->object), emotion_object_progress_info_get(ev->object)); - - return EINA_TRUE; } -static Eina_Bool +static void _frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev) { int w, h; emotion_object_size_get(ev->object, &w, &h); fprintf(stderr, "smartcb: frame_resize: %dx%d\n", w, h); - - return EINA_TRUE; } static void /* adjust canvas' contents on resizes */ diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c index f0d7fabd3c..f7afebabfe 100644 --- a/src/examples/emotion/emotion_generic_example.c +++ b/src/examples/emotion/emotion_generic_example.c @@ -18,22 +18,18 @@ static Eina_List *filenames = NULL; static Eina_List *curfile = NULL; -static Eina_Bool +static void _playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) { printf("Emotion object started playback.\n"); - - return EINA_TRUE; } -static Eina_Bool +static void _playback_stopped_cb(void *data EINA_UNUSED, const Eo_Event *ev) { printf("Emotion playback stopped.\n"); emotion_object_play_set(ev->object, EINA_FALSE); emotion_object_position_set(ev->object, 0); - - return EINA_TRUE; } static Evas_Object * @@ -130,38 +126,30 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void * } } -static Eina_Bool +static void _frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) { // fprintf(stderr, "smartcb: frame_decode\n"); - - return EINA_TRUE; } -static Eina_Bool +static void _length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) { fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object)); - - return EINA_TRUE; } -static Eina_Bool +static void _position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) { fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object)); - - return EINA_TRUE; } -static Eina_Bool +static void _progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) { fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n", emotion_object_progress_status_get(ev->object), emotion_object_progress_info_get(ev->object)); - - return EINA_TRUE; } EO_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks, diff --git a/src/examples/emotion/emotion_generic_subtitle_example.c b/src/examples/emotion/emotion_generic_subtitle_example.c index 524691651d..8bfa151277 100644 --- a/src/examples/emotion/emotion_generic_subtitle_example.c +++ b/src/examples/emotion/emotion_generic_subtitle_example.c @@ -13,12 +13,10 @@ #define WIDTH (320) #define HEIGHT (240) -static Eina_Bool +static void _playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) { printf("Emotion object started playback.\n"); - - return EINA_TRUE; } static void diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c index ecf30a7cc8..aae1063ef9 100644 --- a/src/examples/emotion/emotion_signals_example.c +++ b/src/examples/emotion/emotion_signals_example.c @@ -33,69 +33,55 @@ _display_info(Evas_Object *o) printf("\n"); } -static Eina_Bool +static void _playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev) { printf(">>> Emotion object started playback.\n"); _display_info(ev->object); - - return EINA_TRUE; } -static Eina_Bool +static void _playback_finished_cb(void *data EINA_UNUSED, const Eo_Event *ev) { printf(">>> Emotion object finished playback.\n"); _display_info(ev->object); - - return EINA_TRUE; } -static Eina_Bool +static void _open_done_cb(void *data EINA_UNUSED, const Eo_Event *ev) { printf(">>> Emotion object open done.\n"); _display_info(ev->object); - - return EINA_TRUE; } -static Eina_Bool +static void _position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) { printf(">>> Emotion object first position update.\n"); eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL); _display_info(ev->object); - - return EINA_TRUE; } -static Eina_Bool +static void _frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev) { printf(">>> Emotion object first frame decode.\n"); eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL); _display_info(ev->object); - - return EINA_TRUE; } -static Eina_Bool +static void _decode_stop_cb(void *data EINA_UNUSED, const Eo_Event *ev) { printf(">>> Emotion object decode stop.\n"); _display_info(ev->object); - - return EINA_TRUE; } -static Eina_Bool +static void _frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev) { printf(">>> Emotion object frame resize.\n"); _display_info(ev->object); - - return EINA_TRUE; } static void diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c index 67b0221229..e7782f0d6c 100644 --- a/src/examples/evas/evas-3d-shadows.c +++ b/src/examples/evas/evas-3d-shadows.c @@ -88,7 +88,7 @@ typedef struct _Scene_Data Eina_Bool init; } Scene_Data; -Eina_Bool +void _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event) { Eina_List *meshes = NULL, *l; @@ -112,11 +112,9 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event) } choosed_node = (Evas_Canvas3D_Node *)event->info; } - - return EINA_TRUE; } -Eina_Bool +void _cb_collision(void *data EINA_UNUSED, const Eo_Event *event) { Eina_List *meshes = NULL, *l; @@ -126,8 +124,6 @@ _cb_collision(void *data EINA_UNUSED, const Eo_Event *event) { evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE); } - - return EINA_TRUE; } static void diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c index f0d6cd7e6f..1512af3c5a 100644 --- a/src/lib/ecore/ecore_idler.c +++ b/src/lib/ecore/ecore_idler.c @@ -20,15 +20,13 @@ struct _Ecore_Factorized_Idle Eina_Bool delete_me : 1; }; -Eina_Bool +void _ecore_factorized_idle_event_del(void *data, const Eo_Event *event EINA_UNUSED) { _ecore_factorized_idle_del(data); - - return EO_CALLBACK_CONTINUE; } -Eina_Bool +void _ecore_factorized_idle_process(void *data, const Eo_Event *event EINA_UNUSED) { Ecore_Factorized_Idle *idler = data; @@ -41,8 +39,6 @@ _ecore_factorized_idle_process(void *data, const Eo_Event *event EINA_UNUSED) if (idler->delete_me && idler->references == 0) _ecore_factorized_idle_del(idler); - - return EO_CALLBACK_CONTINUE; } void * diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index 0ee0eb69ad..7bab6e6593 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c @@ -2753,7 +2753,7 @@ _efl_loop_eo_base_provider_find(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, const Eo return eo_provider_find(eo_super(obj, EFL_LOOP_CLASS), klass); } -static Eina_Bool +static void _check_event_catcher_add(void *data, const Eo_Event *event) { const Eo_Callback_Array_Item *array = event->info; @@ -2767,11 +2767,9 @@ _check_event_catcher_add(void *data, const Eo_Event *event) ++pd->idlers; } } - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _check_event_catcher_del(void *data, const Eo_Event *event) { const Eo_Callback_Array_Item *array = event->info; @@ -2785,8 +2783,6 @@ _check_event_catcher_del(void *data, const Eo_Event *event) --pd->idlers; } } - - return EO_CALLBACK_CONTINUE; } EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch, @@ -2848,8 +2844,8 @@ _efl_loop_args_add(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, int argc, const char eina_promise_then(job, _efl_loop_args_job_cb, NULL, args); } -static Eina_Bool _efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED); -static Eina_Bool _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED); +static void _efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED); +static void _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED); EO_CALLBACKS_ARRAY_DEFINE(timeout, { EFL_LOOP_TIMER_EVENT_TICK, _efl_loop_timeout_cb }, @@ -2858,15 +2854,13 @@ EO_CALLBACKS_ARRAY_DEFINE(timeout, /* This event will be triggered when the main loop is destroyed and destroy its timers along */ static void _efl_loop_internal_cancel(Efl_Internal_Promise *p); -static Eina_Bool +static void _efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED) { _efl_loop_internal_cancel(data); - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED) { Efl_Internal_Promise *t = data; @@ -2875,8 +2869,6 @@ _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED) eo_event_callback_array_del(t->u.timer, timeout(), t); eo_del(t->u.timer); - - return EO_CALLBACK_CONTINUE; } static void diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h index 1b4b355b50..172a43c837 100644 --- a/src/lib/ecore/ecore_private.h +++ b/src/lib/ecore/ecore_private.h @@ -163,8 +163,8 @@ Ecore_Factorized_Idle *_ecore_factorized_idle_add(const Eo_Callback_Array_Item*d Ecore_Task_Cb func, const void *data); void *_ecore_factorized_idle_del(Ecore_Idler *idler); -Eina_Bool _ecore_factorized_idle_process(void *data, const Eo_Event *event); -Eina_Bool _ecore_factorized_idle_event_del(void *data, const Eo_Event *event); +void _ecore_factorized_idle_process(void *data, const Eo_Event *event); +void _ecore_factorized_idle_event_del(void *data, const Eo_Event *event); void _ecore_idler_all_call(Eo *loop); int _ecore_idler_exist(Eo *loop); diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index b7fce54c58..391c792e4b 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -74,7 +74,7 @@ ecore_timer_precision_set(double value) precision = value; } -static Eina_Bool +static void _check_timer_event_catcher_add(void *data, const Eo_Event *event) { const Eo_Callback_Array_Item *array = event->info; @@ -85,18 +85,16 @@ _check_timer_event_catcher_add(void *data, const Eo_Event *event) { if (array[i].desc == EFL_LOOP_TIMER_EVENT_TICK) { - if (timer->listening++ > 0) return EO_CALLBACK_CONTINUE; + if (timer->listening++ > 0) return; _efl_loop_timer_util_instanciate(timer); // No need to walk more than once per array as you can not del // a partial array - return EO_CALLBACK_CONTINUE; + return; } } - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _check_timer_event_catcher_del(void *data, const Eo_Event *event) { const Eo_Callback_Array_Item *array = event->info; @@ -107,13 +105,11 @@ _check_timer_event_catcher_del(void *data, const Eo_Event *event) { if (array[i].desc == EFL_LOOP_TIMER_EVENT_TICK) { - if ((--timer->listening) > 0) return EO_CALLBACK_CONTINUE; + if ((--timer->listening) > 0) return; _efl_loop_timer_util_instanciate(timer); - return EO_CALLBACK_CONTINUE; + return; } } - - return EO_CALLBACK_CONTINUE; } EO_CALLBACKS_ARRAY_DEFINE(timer_watch, @@ -155,17 +151,15 @@ struct _Ecore_Timer_Legacy Eina_Bool delete_me : 1; }; -static Eina_Bool +static void _ecore_timer_legacy_del(void *data, const Eo_Event *event EINA_UNUSED) { Ecore_Timer_Legacy *legacy = data; free(legacy); - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _ecore_timer_legacy_tick(void *data, const Eo_Event *event) { Ecore_Timer_Legacy *legacy = data; @@ -174,8 +168,6 @@ _ecore_timer_legacy_tick(void *data, const Eo_Event *event) if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data) || legacy->delete_me) eo_del(event->object); - - return EO_CALLBACK_CONTINUE; } EO_CALLBACKS_ARRAY_DEFINE(legacy_timer, diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c index 80e7a18538..fdd59b1974 100644 --- a/src/lib/ecore/efl_loop_fd.c +++ b/src/lib/ecore/efl_loop_fd.c @@ -92,7 +92,7 @@ _efl_loop_fd_fd_file_get(Eo *obj EINA_UNUSED, Efl_Loop_Fd_Data *pd) return pd->file ? pd->fd : -1; } -static Eina_Bool +static void _check_fd_event_catcher_add(void *data, const Eo_Event *event) { const Eo_Callback_Array_Item *array = event->info; @@ -117,11 +117,9 @@ _check_fd_event_catcher_add(void *data, const Eo_Event *event) _efl_loop_fd_reset(event->object, fd); } } - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _check_fd_event_catcher_del(void *data, const Eo_Event *event) { const Eo_Callback_Array_Item *array = event->info; @@ -146,8 +144,6 @@ _check_fd_event_catcher_del(void *data, const Eo_Event *event) _efl_loop_fd_reset(event->object, fd); } } - - return EO_CALLBACK_CONTINUE; } EO_CALLBACKS_ARRAY_DEFINE(fd_watch, diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c index 05c42b4507..7c6db021a7 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c @@ -88,7 +88,7 @@ static void _write_cb(pa_stream *stream, size_t len, void *data) } } -static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *event) +static void _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *event) { pa_stream *stream = NULL; int samplerate = 0; @@ -100,8 +100,6 @@ static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *e stream = eo_key_data_get(event->object, "pulse_data"); pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL)); - - return EINA_TRUE; } static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in) @@ -146,14 +144,12 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in) return ret; } -static Eina_Bool _delayed_attach_cb(void *data, const Eo_Event *event) +static void _delayed_attach_cb(void *data, const Eo_Event *event) { Eo *in = data; eo_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in); _input_attach_internal(event->object, in); - - return EINA_TRUE; } EOLIAN static Eina_Bool diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c index 3037d2cd5b..df01406bf9 100644 --- a/src/lib/ecore_con/ecore_con_url.c +++ b/src/lib/ecore_con/ecore_con_url.c @@ -161,23 +161,27 @@ ecore_con_url_pipeline_get(void) extern Ecore_Con_Socks *_ecore_con_proxy_global; -static Eina_Bool +static void _efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event) { Ecore_Con_Event_Url_Complete *e, *f = event->info; e = calloc(1, sizeof(Ecore_Con_Event_Url_Complete)); - if (!e) return EO_CALLBACK_STOP; + if (!e) + { + eo_event_callback_stop(event->object); + return; + } e->status = f->status; e->url_con = f->url_con; ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e, (Ecore_End_Cb)_ecore_con_event_url_free, event->object); - return EO_CALLBACK_STOP; + eo_event_callback_stop(event->object); } -static Eina_Bool +static void _efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event) { Ecore_Con_Event_Url_Data *e; @@ -185,24 +189,22 @@ _efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event) e = malloc(sizeof(Ecore_Con_Event_Url_Data) + sizeof(unsigned char) * f->size); - if (!e) return EO_CALLBACK_CONTINUE; + if (!e) return; e->url_con = f->url_con; e->size = f->size; memcpy(e->data, f->data, f->size); ecore_event_add(ECORE_CON_EVENT_URL_DATA, e, (Ecore_End_Cb)_ecore_con_event_url_free, event->object); - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event) { Ecore_Con_Event_Url_Progress *e, *f = event->info; e = malloc(sizeof(Ecore_Con_Event_Url_Progress)); - if (!e) return EO_CALLBACK_CONTINUE; + if (!e) return; e->url_con = f->url_con; e->down.total = f->down.total; @@ -211,8 +213,6 @@ _efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event e->up.now = f->up.now; ecore_event_add(ECORE_CON_EVENT_URL_PROGRESS, e, (Ecore_End_Cb)_ecore_con_event_url_free, event->object); - - return EO_CALLBACK_CONTINUE; } EO_CALLBACKS_ARRAY_DEFINE(efl_network_url_event_table_callbacks, diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index 01b01aface..1a6bed5981 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -3161,7 +3161,7 @@ _ecore_evas_animator_fallback(void *data) return EINA_TRUE; } -static Eina_Bool +static void _check_animator_event_catcher_add(void *data, const Eo_Event *event) { const Eo_Callback_Array_Item *array = event->info; @@ -3172,7 +3172,7 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event) { if (array[i].desc == EFL_EVENT_ANIMATOR_TICK) { - if (ee->anim_count++ > 0) return EO_CALLBACK_CONTINUE; + if (ee->anim_count++ > 0) return; INF("Setting up animator for %p from '%s' with title '%s'.", ee->evas, ee->driver, ee->prop.title); if (ee->engine.func->fn_animator_register && @@ -3190,14 +3190,12 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event) // No need to walk more than once per array as you can not del // a partial array - return EO_CALLBACK_CONTINUE; + return; } } - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _check_animator_event_catcher_del(void *data, const Eo_Event *event) { const Eo_Callback_Array_Item *array = event->info; @@ -3208,7 +3206,7 @@ _check_animator_event_catcher_del(void *data, const Eo_Event *event) { if (array[i].desc == EFL_EVENT_ANIMATOR_TICK) { - if ((--ee->anim_count) > 0) return EO_CALLBACK_CONTINUE; + if ((--ee->anim_count) > 0) return; INF("Unsetting up animator for %p from '%s' titled '%s'.", ee->evas, ee->driver, ee->prop.title); if (ee->engine.func->fn_animator_register && @@ -3224,11 +3222,9 @@ _check_animator_event_catcher_del(void *data, const Eo_Event *event) ecore_animator_del(ee->anim); ee->anim = NULL; } - return EO_CALLBACK_CONTINUE; + return; } } - - return EO_CALLBACK_CONTINUE; } EO_CALLBACKS_ARRAY_DEFINE(animator_watch, diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c index ba423a29fa..811dc5cac1 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c @@ -75,15 +75,13 @@ struct _Ector_Renderer_Cairo_Shape_Data cairo_path_t *path; }; -static Eina_Bool +static void _ector_renderer_cairo_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED) { Ector_Renderer_Cairo_Shape_Data *pd = data; if (pd->path) cairo_path_destroy(pd->path); pd->path = NULL; - - return EINA_TRUE; } static Eina_Bool diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c index b6bd8efc26..7edc5e9e43 100644 --- a/src/lib/ector/gl/ector_renderer_gl_shape.c +++ b/src/lib/ector/gl/ector_renderer_gl_shape.c @@ -20,15 +20,13 @@ struct _Ector_Renderer_GL_Shape_Data GLshort *vertex; }; -static Eina_Bool +static void _ector_renderer_gl_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED) { Ector_Renderer_GL_Shape_Data *pd = data; free(pd->vertex); pd->vertex = NULL; - - return EINA_TRUE; } static Eina_Bool diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c index 835e0ac4b8..0a3f719498 100644 --- a/src/lib/ector/software/ector_renderer_software_shape.c +++ b/src/lib/ector/software/ector_renderer_software_shape.c @@ -679,7 +679,7 @@ _ector_renderer_software_shape_efl_gfx_shape_path_set(Eo *obj, } -static Eina_Bool +static void _ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED) { Ector_Renderer_Software_Shape_Data *pd = data; @@ -689,8 +689,6 @@ _ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EI pd->shape_data = NULL; pd->outline_data = NULL; - - return EINA_TRUE; } static Eo * diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c index f50af80a78..7afd37dc88 100644 --- a/src/lib/edje/edje_callbacks.c +++ b/src/lib/edje/edje_callbacks.c @@ -3,7 +3,7 @@ #define EFL_INTERNAL_UNSTABLE #include "interfaces/efl_common_internal.h" -static Eina_Bool +static void _edje_hold_signal_cb(void *data, const Eo_Event *event) { Evas_Event_Hold *ev; @@ -13,16 +13,14 @@ _edje_hold_signal_cb(void *data, const Eo_Event *event) ev = event->info; ed = data; rp = evas_object_data_get(event->object, "real_part"); - if (!rp) return EO_CALLBACK_CONTINUE; + if (!rp) return; if (ev->hold) _edje_emit(ed, "hold,on", rp->part->name); else _edje_emit(ed, "hold,off", rp->part->name); - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _edje_focus_in_signal_cb(void *data, const Eo_Event *event) { Edje *ed; @@ -31,14 +29,12 @@ _edje_focus_in_signal_cb(void *data, const Eo_Event *event) ed = data; rp = evas_object_data_get(event->object, "real_part"); if ((!rp) || (!ed)) - return EO_CALLBACK_CONTINUE; + return; _edje_emit(ed, "focus,part,in", rp->part->name); - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _edje_focus_out_signal_cb(void *data, const Eo_Event *event) { Edje *ed; @@ -47,14 +43,12 @@ _edje_focus_out_signal_cb(void *data, const Eo_Event *event) ed = data; rp = evas_object_data_get(event->object, "real_part"); if ((!rp) || (!ed)) - return EO_CALLBACK_CONTINUE; + return; _edje_emit(ed, "focus,part,out", rp->part->name); - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _edje_mouse_in_signal_cb(void *data, const Eo_Event *event) { Efl_Event_Pointer_Data *ev; @@ -71,11 +65,9 @@ _edje_mouse_in_signal_cb(void *data, const Eo_Event *event) ev->event_flags |= rp->part->mask_flags; } - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _edje_mouse_out_signal_cb(void *data, const Eo_Event *event) { Efl_Event_Pointer_Data *ev; @@ -92,11 +84,9 @@ _edje_mouse_out_signal_cb(void *data, const Eo_Event *event) ev->event_flags |= rp->part->mask_flags; } - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _edje_mouse_down_signal_cb(void *data, const Eo_Event *event) { Efl_Event_Pointer_Data *ev; @@ -108,7 +98,7 @@ _edje_mouse_down_signal_cb(void *data, const Eo_Event *event) ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); ed = data; rp = evas_object_data_get(event->object, "real_part"); - if (!rp) return EO_CALLBACK_CONTINUE; + if (!rp) return; ignored = rp->part->ignore_flags & ev->event_flags; @@ -163,11 +153,9 @@ _edje_mouse_down_signal_cb(void *data, const Eo_Event *event) _edje_unref(ed); ev->event_flags |= rp->part->mask_flags; - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _edje_mouse_up_signal_cb(void *data, const Eo_Event *event) { Efl_Event_Pointer_Data *ev; @@ -179,7 +167,7 @@ _edje_mouse_up_signal_cb(void *data, const Eo_Event *event) ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); ed = data; rp = evas_object_data_get(event->object, "real_part"); - if (!rp) return EO_CALLBACK_CONTINUE; + if (!rp) return; ignored = rp->part->ignore_flags & ev->event_flags; @@ -238,11 +226,9 @@ _edje_mouse_up_signal_cb(void *data, const Eo_Event *event) _edje_unref(ed); ev->event_flags |= rp->part->mask_flags; - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _edje_mouse_move_signal_cb(void *data, const Eo_Event *event) { Efl_Event_Pointer_Data *ev; @@ -253,7 +239,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event) ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); ed = data; rp = evas_object_data_get(event->object, "real_part"); - if (!rp) return EO_CALLBACK_CONTINUE; + if (!rp) return; if (rp->part->dragable.event_id >= 0) { rp = ed->table_parts[rp->part->dragable.event_id % ed->table_parts_size]; @@ -347,11 +333,9 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event) _edje_util_thaw(ed); ev->event_flags |= rp->part->mask_flags; - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event) { Efl_Event_Pointer_Data *ev; @@ -374,11 +358,9 @@ _edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event) ev->event_flags |= rp->part->mask_flags; } - - return EO_CALLBACK_CONTINUE; } -Eina_Bool +void _edje_timer_cb(void *data, const Eo_Event *event EINA_UNUSED) { double t; @@ -433,8 +415,6 @@ break_prog: _edje_unblock(ed); _edje_util_thaw(ed); _edje_unref(ed); - - return EO_CALLBACK_CONTINUE; } Eina_Bool diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c index 31028ce176..f79b9e62f0 100644 --- a/src/lib/edje/edje_multisense.c +++ b/src/lib/edje/edje_multisense.c @@ -7,21 +7,18 @@ static Eo *out = NULL; static int outs = 0; static Eina_Bool outfail = EINA_FALSE; -static Eina_Bool +static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event) { eo_del(event->object); - - return EINA_TRUE; } -static Eina_Bool +static void _out_fail(void *data EINA_UNUSED, const Eo_Event *event) { outfail = EINA_TRUE; eo_del(event->object); out = NULL; - return EINA_TRUE; } struct _edje_multisense_eet_data diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index b8ad91bd66..5b6898a9ff 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h @@ -2347,7 +2347,7 @@ void _edje_recalc_do(Edje *ed); int _edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y); void _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y); -Eina_Bool _edje_timer_cb(void *data, const Eo_Event *event); +void _edje_timer_cb(void *data, const Eo_Event *event); Eina_Bool _edje_pending_timer_cb(void *data); void _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp); void _edje_callbacks_focus_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp); diff --git a/src/lib/efl/interfaces/efl_vpath_manager.c b/src/lib/efl/interfaces/efl_vpath_manager.c index bde316d249..d3910c880a 100644 --- a/src/lib/efl/interfaces/efl_vpath_manager.c +++ b/src/lib/efl/interfaces/efl_vpath_manager.c @@ -50,12 +50,11 @@ _register_sort_cb(Efl_Vpath_Manager_Entry *e1, Efl_Vpath_Manager_Entry *e2) return (e2->priority - e1->priority); } -static Eina_Bool +static void _cb_vpath_del(void *data, const Eo_Event *event) { efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->object); eo_event_callback_del(event->object, EO_EVENT_DEL, _cb_vpath_del, data); - return EINA_TRUE; } EOLIAN static void diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c index 0291dd7c3f..6efefa294c 100644 --- a/src/lib/elementary/efl_ui_box.c +++ b/src/lib/elementary/efl_ui_box.c @@ -23,26 +23,22 @@ _efl_ui_box_list_data_get(const Eina_List *list) return opt->obj; } -static Eina_Bool +static void _child_added_cb_proxy(void *data, const Eo_Event *event) { Evas_Object *box = data; Evas_Object_Box_Option *opt = event->info; eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_ADDED, opt->obj); - - return EINA_TRUE; } -static Eina_Bool +static void _child_removed_cb_proxy(void *data, const Eo_Event *event) { Evas_Object *box = data; Evas_Object *child = event->info; eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child); - - return EINA_TRUE; } EOLIAN static Eina_Bool diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c index 7073964ab9..8f544c48a3 100644 --- a/src/lib/elementary/efl_ui_grid.c +++ b/src/lib/elementary/efl_ui_grid.c @@ -7,7 +7,7 @@ typedef struct _Custom_Table_Data Custom_Table_Data; -static Eina_Bool _subobj_del_cb(void *data, const Eo_Event *event); +static void _subobj_del_cb(void *data, const Eo_Event *event); static void _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj); struct _Custom_Table_Data @@ -336,7 +336,7 @@ _efl_ui_grid_efl_pack_pack_padding_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED if (v) *v = pd->pad.v; } -static Eina_Bool +static void _subobj_del_cb(void *data, const Eo_Event *event) { Efl_Ui_Grid *obj = data; @@ -347,8 +347,6 @@ _subobj_del_cb(void *data, const Eo_Event *event) if (!elm_widget_sub_object_del(obj, event->object)) WRN("failed to remove child from its parent"); - - return EO_CALLBACK_CONTINUE; } static Eina_Bool diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c index 514c53c2fb..0286727f88 100644 --- a/src/lib/elementary/efl_ui_internal_text_interactive.c +++ b/src/lib/elementary/efl_ui_internal_text_interactive.c @@ -500,14 +500,12 @@ _entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text return en->selection; } -static Eina_Bool +static void _sel_cursor_changed(void *data, const Eo_Event *event EINA_UNUSED) { Efl_Canvas_Text_Cursor *obj = data; eo_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL); - - return EO_CALLBACK_CONTINUE; } static void diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 514961f8a8..7473281a5c 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -228,9 +228,9 @@ static void _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd); static void _magnifier_move(void *data); static void _update_decorations(Eo *obj); static void _create_text_cursors(Efl_Ui_Text_Data *sd); -static Eina_Bool _efl_ui_text_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); -static Eina_Bool _efl_ui_text_selection_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); -static Eina_Bool _efl_ui_text_cursor_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); +static void _efl_ui_text_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); +static void _efl_ui_text_selection_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); +static void _efl_ui_text_cursor_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); static void _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); static void _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd); static void _efl_ui_text_select_all(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd); @@ -458,7 +458,7 @@ _validate(Evas_Object *obj) vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text"); res = eo_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc); buf = eina_strbuf_new(); - eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EO_CALLBACK_STOP ? "fail" : "pass"); + eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass"); edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm"); eina_tmpstr_del(vc.signal); eina_strbuf_free(buf); @@ -1478,7 +1478,7 @@ _hover_del_job(void *data) sd->hov_deljob = NULL; } -static Eina_Bool +static void _hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED) { EFL_UI_TEXT_DATA_GET(data, sd); @@ -1497,8 +1497,6 @@ _hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED) elm_widget_scroll_freeze_pop(data); ecore_job_del(sd->hov_deljob); sd->hov_deljob = ecore_job_add(_hover_del_job, data); - - return EINA_TRUE; } static void @@ -2629,13 +2627,11 @@ _anchor_hover_del_cb(void *data, (sd->anchor_hover.hover, EVAS_CALLBACK_DEL, _anchor_hover_del_cb, obj); } -static Eina_Bool +static void _anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) { EFL_UI_TEXT_DATA_GET(data, sd); _efl_ui_text_anchor_hover_end(data, sd); - - return EINA_TRUE; } static void @@ -4059,7 +4055,7 @@ _efl_ui_text_elm_layout_theme_enable(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd E return EINA_FALSE; } -static Eina_Bool +static void _cb_added(void *data EINA_UNUSED, const Eo_Event *ev) { const Eo_Callback_Array_Item *event = ev->info; @@ -4067,10 +4063,9 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev) EFL_UI_TEXT_DATA_GET(ev->object, sd); if (event->desc == EFL_UI_TEXT_EVENT_VALIDATE) sd->validators++; - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) { const Eo_Callback_Array_Item *event = ev->info; @@ -4078,7 +4073,7 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) EFL_UI_TEXT_DATA_GET(ev->object, sd); if (event->desc == EFL_UI_TEXT_EVENT_VALIDATE) sd->validators--; - return EO_CALLBACK_CONTINUE; + return; } @@ -5604,25 +5599,22 @@ _update_decorations(Eo *obj) _update_text_selection(obj, text_obj); } -static Eina_Bool +static void _efl_ui_text_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) { _update_decorations(data); - return EINA_TRUE; } -static Eina_Bool +static void _efl_ui_text_cursor_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) { _update_text_cursors(data); - return EINA_TRUE; } -static Eina_Bool +static void _efl_ui_text_selection_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) { _update_text_selection(data, event->object); - return EINA_TRUE; } static void diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 595f852fe3..f5a0280d95 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -1658,7 +1658,7 @@ _efl_ui_win_elm_widget_event(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Evas_Obj } /* forward events sent to evas to the window */ -static Eina_Bool +static void _evas_event_key_cb(void *data, const Eo_Event *ev) { Eo *win = data; @@ -1667,17 +1667,16 @@ _evas_event_key_cb(void *data, const Eo_Event *ev) evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS); if (!evdata || evdata->win_fed) - return EO_CALLBACK_CONTINUE; + return; // evas_callbacks will send the event to the focussed object (ie. this win) if (evas_focus_get(evas_object_evas_get(win)) == win) - return EO_CALLBACK_CONTINUE; + return; eo_event_callback_call(win, ev->desc, evt); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _evas_event_pointer_cb(void *data, const Eo_Event *ev) { Eo *win = data; @@ -1686,14 +1685,13 @@ _evas_event_pointer_cb(void *data, const Eo_Event *ev) evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); if (!evdata || evdata->win_fed) - return EO_CALLBACK_CONTINUE; + return; eo_event_callback_call(win, ev->desc, evt); - return EO_CALLBACK_CONTINUE; } /* feed events from the window to evas - for fake inputs */ -static Eina_Bool +static void _evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev) { Eo *evas = data; @@ -1701,20 +1699,19 @@ _evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev) Efl_Event_Key_Data *evdata; if (!efl_event_fake_get(evt)) - return EO_CALLBACK_CONTINUE; + return; evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS); if (!evdata || evdata->win_fed) - return EO_CALLBACK_CONTINUE; + return; evdata->win_fed = EINA_TRUE; eo_event_callback_call(evas, ev->desc, evt); evdata->win_fed = EINA_FALSE; evdata->evas_done = EINA_FALSE; - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev) { Eo *evas = data; @@ -1722,17 +1719,16 @@ _evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev) Efl_Event_Pointer_Data *evdata; if (!efl_event_fake_get(evt)) - return EO_CALLBACK_CONTINUE; + return; evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); if (!evdata || evdata->win_fed) - return EO_CALLBACK_CONTINUE; + return; evdata->win_fed = EINA_TRUE; eo_event_callback_call(evas, ev->desc, evt); evdata->win_fed = EINA_FALSE; evdata->evas_done = EINA_FALSE; - return EO_CALLBACK_CONTINUE; } EO_CALLBACKS_ARRAY_DEFINE(_elm_win_evas_feed_fake_callbacks, @@ -1830,7 +1826,7 @@ _elm_win_evas_device_changed(void *data, eo_event_callback_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device); } -static Eina_Bool +static void _win_event_add_cb(void *data, const Eo_Event *ev) { const Eo_Callback_Array_Item *array = ev->info; @@ -1937,11 +1933,9 @@ _win_event_add_cb(void *data, const Eo_Event *ev) _elm_win_evas_device_changed, win); } } - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _win_event_del_cb(void *data, const Eo_Event *ev) { const Eo_Callback_Array_Item *array = ev->info; @@ -2048,8 +2042,6 @@ _win_event_del_cb(void *data, const Eo_Event *ev) _elm_win_evas_device_changed, win); } } - - return EO_CALLBACK_CONTINUE; } static void @@ -5720,7 +5712,7 @@ _elm_win_focus_auto_hide(Evas_Object *obj) } } -static Eina_Bool +static void _on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { Evas_Object *win; @@ -5749,7 +5741,6 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSE else elm_interface_atspi_window_deactivated_signal_emit(win); } - return EINA_TRUE; } EOLIAN static void diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index 04fb81d404..f9e3d76d7c 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -90,7 +90,7 @@ _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd) return EINA_TRUE; } -static Eina_Bool +static void _on_hover_clicked(void *data, const Eo_Event *event) { const char *dismissstr; @@ -99,8 +99,6 @@ _on_hover_clicked(void *data, const Eo_Event *event) if (!dismissstr || strcmp(dismissstr, "on")) elm_combobox_hover_end(data); // for backward compatibility - - return EINA_TRUE; } static void @@ -213,7 +211,7 @@ _on_item_pressed(void *data , Evas_Object *obj EINA_UNUSED, void *event) eo_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_PRESSED, event); } -static Eina_Bool +static void _gl_filter_finished_cb(void *data, const Eo_Event *event) { char buf[1024]; @@ -224,7 +222,7 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event) if (sd->first_filter) { sd->first_filter = EINA_FALSE; - return EINA_TRUE; + return; } eo_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info); @@ -243,30 +241,25 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event) elm_layout_signal_emit(sd->hover, buf, "elm"); edje_object_message_signal_process(elm_layout_edje_get(sd->hover)); } - - return EINA_TRUE; } -static Eina_Bool +static void _on_aborted(void *data, const Eo_Event *event EINA_UNUSED) { ELM_COMBOBOX_DATA_GET(data, sd); if (sd->expanded) elm_combobox_hover_end(data); - return EINA_TRUE; } -static Eina_Bool +static void _on_changed(void *data, const Eo_Event *event EINA_UNUSED) { eo_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED, NULL); - return EINA_TRUE; } -static Eina_Bool +static void _on_clicked(void *data, const Eo_Event *event EINA_UNUSED) { elm_combobox_hover_begin(data); - return EINA_TRUE; } EOLIAN static void @@ -317,34 +310,30 @@ _elm_combobox_multiple_selection_get(Eo *obj EINA_UNUSED, Elm_Combobox_Data *pd) return pd->multiple_selection; } -static Eina_Bool +static void _mbe_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event) { //Unset the multibuttonentry to contracted mode of single line elm_multibuttonentry_expanded_set(event->object, EINA_TRUE); - return EINA_TRUE; } -static Eina_Bool +static void _mbe_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { - return EINA_TRUE; } -static Eina_Bool +static void _mbe_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event) { //Set the multibuttonentry to contracted mode of single line elm_multibuttonentry_expanded_set(event->object, EINA_FALSE); - return EINA_TRUE; } -static Eina_Bool +static void _mbe_item_added(void *data, const Eo_Event *event EINA_UNUSED) { ELM_COMBOBOX_DATA_GET(data, sd); elm_genlist_filter_set(sd->genlist, NULL); - return EINA_TRUE; } EO_CALLBACKS_ARRAY_DEFINE(mbe_callbacks, diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index d3053a7dc6..34bce99378 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -56,14 +56,14 @@ static const Elm_Action key_actions[] = { {NULL, NULL} }; -static Eina_Bool _ok(void *data, const Eo_Event *event); -static Eina_Bool _canc(void *data, const Eo_Event *event); -static Eina_Bool _on_dir_up(void *data, const Eo_Event *event); +static void _ok(void *data, const Eo_Event *event); +static void _canc(void *data, const Eo_Event *event); +static void _on_dir_up(void *data, const Eo_Event *event); static void _populate(Evas_Object *obj, Efl_Model *model, Elm_Object_Item *parent_it, Efl_Model *selected); static Elm_Fileselector_Item_Data *_selected_item_data_get(Elm_Fileselector_Data *sd); -static Eina_Bool _resource_created(void *, const Eo_Event *); -static Eina_Bool _resource_deleted(void *, const Eo_Event *); +static void _resource_created(void *, const Eo_Event *); +static void _resource_deleted(void *, const Eo_Event *); static void _listing_request_cleanup(Listing_Request *); static void @@ -954,45 +954,37 @@ _populate(Evas_Object *obj, eina_promise_then(promise_all, _process_children_cb, _process_children_error_cb, lreq); } -static Eina_Bool +static void _on_list_expanded(void *data, const Eo_Event *event) { Elm_Object_Item *it = event->info; const Elm_Fileselector_Item_Data *it_data = elm_object_item_data_get(it); _populate(data, it_data->model, it, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event) { Elm_Object_Item *it = event->info; elm_genlist_item_subitems_clear(it); - - return EINA_TRUE; } -static Eina_Bool +static void _on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event) { Elm_Object_Item *it = event->info; elm_genlist_item_expanded_set(it, EINA_TRUE); - - return EINA_TRUE; } -static Eina_Bool +static void _on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event) { Elm_Object_Item *it = event->info; elm_genlist_item_expanded_set(it, EINA_FALSE); - - return EINA_TRUE; } static Eina_Bool @@ -1042,7 +1034,7 @@ _schedule_populate(Evas_Object *fs, sd->populate_idler = ecore_idler_add(_populate_do, sdata); } -static Eina_Bool +static void _on_item_activated(void *data, const Eo_Event *event) { //This event_info could be a list or gengrid item @@ -1052,7 +1044,7 @@ _on_item_activated(void *data, const Eo_Event *event) ELM_FILESELECTOR_DATA_GET(data, sd); it_data = elm_object_item_data_get(it); - if (!it_data) return EINA_TRUE; + if (!it_data) return; if (!it_data->is_dir) { @@ -1060,14 +1052,12 @@ _on_item_activated(void *data, const Eo_Event *event) //eo_event_callback_call // (data, ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)it_data->model); evas_object_smart_callback_call(data, "activated", (void *)it_data->path); - return EINA_TRUE; + return; } - if (!sd->double_tap_navigation) return EINA_TRUE; + if (!sd->double_tap_navigation) return; _schedule_populate(data, sd, it_data->model, NULL); - - return EINA_TRUE; } static void @@ -1098,7 +1088,7 @@ _clear_selections(Elm_Fileselector_Data *sd, Elm_Object_Item *last_selected) } } -static Eina_Bool +static void _on_item_selected(void *data, const Eo_Event *event) { //This event_info could be a list or gengrid item @@ -1108,7 +1098,7 @@ _on_item_selected(void *data, const Eo_Event *event) ELM_FILESELECTOR_DATA_GET(data, sd); it_data = elm_object_item_data_get(it); - if (!it_data) return EINA_TRUE; + if (!it_data) return; /* We need to send callback when: * - path is dir and mode is ONLY FOLDER @@ -1166,7 +1156,7 @@ _on_item_selected(void *data, const Eo_Event *event) { _elm_fileselector_replace_model(data, sd, it_data->parent_model, it_data->parent_path); _anchors_do(data, it_data->parent_path); - return EINA_TRUE; + return; } if (sd->only_folder) { @@ -1181,19 +1171,17 @@ _on_item_selected(void *data, const Eo_Event *event) // Clear name entry not in case of save mode. if (elm_object_disabled_get(sd->name_entry)) elm_object_text_set(sd->name_entry, ""); - return EINA_TRUE; + return; } - if (!it_data->is_dir) return EINA_TRUE; + if (!it_data->is_dir) return; - if (sd->double_tap_navigation) return EINA_TRUE; + if (sd->double_tap_navigation) return; _schedule_populate(data, sd, it_data->model, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _on_item_unselected(void *data, const Eo_Event *event) { Eina_List *li, *l; @@ -1205,10 +1193,10 @@ _on_item_unselected(void *data, const Eo_Event *event) ELM_FILESELECTOR_DATA_GET(data, sd); - if (!sd->multi) return EINA_TRUE; + if (!sd->multi) return; it_data = elm_object_item_data_get(it); - if (!it_data) return EINA_TRUE; + if (!it_data) return; buf = eina_strbuf_new(); EINA_LIST_FOREACH_SAFE(sd->multi_selection, li, l, it2) @@ -1233,11 +1221,9 @@ _on_item_unselected(void *data, const Eo_Event *event) elm_object_text_set(sd->name_entry, eina_strbuf_string_get(buf)); eina_strbuf_free(buf); - - return EINA_TRUE; } -static Eina_Bool +static void _on_dir_up(void *data, const Eo_Event *event EINA_UNUSED) { Evas_Object *fs = data; @@ -1247,13 +1233,11 @@ _on_dir_up(void *data, const Eo_Event *event EINA_UNUSED) parent = eo_parent_get(sd->model); if (!parent) - return EINA_TRUE; + return; _populate(fs, parent, NULL, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _home(void *data, const Eo_Event *event EINA_UNUSED) { Evas_Object *fs = data; @@ -1267,8 +1251,6 @@ _home(void *data, const Eo_Event *event EINA_UNUSED) _populate(fs, model, NULL, NULL); eo_unref(model); } - - return EINA_TRUE; } static void @@ -1286,7 +1268,7 @@ _current_filter_changed(void *data, _populate(filter->sd->obj, filter->sd->model, NULL, NULL); } -static Eina_Bool +static void _ok(void *data, const Eo_Event *event EINA_UNUSED) { const char *name; @@ -1299,7 +1281,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED) // EVENTS: should not call legacy //eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL); evas_object_smart_callback_call(fs, "done", NULL); - return EINA_TRUE; + return; } name = elm_object_text_get(sd->name_entry); @@ -1338,11 +1320,9 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED) // (fs, ELM_FILESELECTOR_EVENT_DONE, sd->model); evas_object_smart_callback_call(fs, "done", (void *) sd->path); } - - return EINA_TRUE; } -static Eina_Bool +static void _canc(void *data, const Eo_Event *event EINA_UNUSED) { Evas_Object *fs = data; @@ -1350,8 +1330,6 @@ _canc(void *data, const Eo_Event *event EINA_UNUSED) // EVENTS: should not call legacy //eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL); evas_object_smart_callback_call(fs, "done", NULL); - - return EINA_TRUE; } static void @@ -1457,7 +1435,7 @@ _on_text_activated_set_path_then_error(void *data, Eina_Error err EINA_UNUSED) _text_activated_free_fs_data(fs); } -static Eina_Bool +static void _on_text_activated(void *data, const Eo_Event *event) { Evas_Object *fs = data; @@ -1468,12 +1446,12 @@ _on_text_activated(void *data, const Eo_Event *event) ELM_FILESELECTOR_DATA_GET(fs, sd); if (!sd->model) - return EINA_TRUE; + return; path = elm_widget_part_text_get(event->object, NULL); model = eo_add(eo_class_get(sd->model), NULL); if (!model) - return EINA_TRUE; + return; _model_str_property_set(model, "path", path, &promise); @@ -1487,8 +1465,6 @@ _on_text_activated(void *data, const Eo_Event *event) eo_unref(model); elm_object_focus_set(event->object, EINA_FALSE); - - return EINA_TRUE; } static Eina_Bool @@ -1504,27 +1480,23 @@ _anchors_undo(void *data) return ECORE_CALLBACK_CANCEL; } -static Eina_Bool +static void _on_text_focused(void *data, const Eo_Event *event EINA_UNUSED) { ELM_FILESELECTOR_DATA_GET(data, sd); if (!sd->path_entry_idler) sd->path_entry_idler = ecore_idler_add(_anchors_undo, data); - - return EINA_TRUE; } -static Eina_Bool +static void _on_text_unfocused(void *data, const Eo_Event *event EINA_UNUSED) { ELM_FILESELECTOR_DATA_GET(data, sd); _anchors_do(data, sd->path); - - return EINA_TRUE; } -static Eina_Bool +static void _anchor_clicked(void *data, const Eo_Event *event) { Elm_Entry_Anchor_Info *info = event->info; @@ -1534,11 +1506,11 @@ _anchor_clicked(void *data, const Eo_Event *event) ELM_FILESELECTOR_DATA_GET(fs, sd); if (!sd->model) - return EINA_TRUE; + return; model = eo_add(eo_class_get(sd->model), NULL); if (!model) - return EINA_TRUE; + return; _model_str_property_set(model, "path", info->name, NULL); _populate(fs, model, NULL, NULL); @@ -1551,11 +1523,9 @@ _anchor_clicked(void *data, const Eo_Event *event) ecore_idler_del(sd->path_entry_idler); sd->path_entry_idler = NULL; } - - return EINA_TRUE; } -static Eina_Bool +static void _files_key_down(void *data, const Eo_Event *event) { Efl_Event_Key *ev = event->info; @@ -1565,7 +1535,7 @@ _files_key_down(void *data, const Eo_Event *event) par = data; searchbar = evas_object_data_get(par, "search"); - if (!searchbar) return EINA_TRUE; + if (!searchbar) return; key = efl_event_key_get(ev); string = efl_event_key_string_get(ev); @@ -1588,8 +1558,6 @@ _files_key_down(void *data, const Eo_Event *event) efl_event_processed_set(ev, EINA_TRUE); } } - - return EINA_TRUE; } static Evas_Object * @@ -1733,7 +1701,7 @@ cancel: free(it_data); } -static Eina_Bool +static void _resource_created(void *data, const Eo_Event *event) { Elm_Fileselector *fs = data; @@ -1746,11 +1714,11 @@ _resource_created(void *data, const Eo_Event *event) ELM_FILESELECTOR_DATA_GET(fs, sd); if (!sd || !sd->monitoring || sd->model != event->object) - return ECORE_CALLBACK_PASS_ON; + return; it_data = calloc(1, sizeof(Elm_Fileselector_Item_Data)); if (!it_data) - return ECORE_CALLBACK_PASS_ON; + return; it_data->model = eo_ref(child); it_data->user_data = eo_ref(fs); @@ -1769,10 +1737,10 @@ _resource_created(void *data, const Eo_Event *event) eina_promise_then(promise_all, _resource_created_then, _resource_then_error, it_data); - return ECORE_CALLBACK_PASS_ON; + return; } -static Eina_Bool +static void _resource_deleted(void *data, const Eo_Event *event) { Evas_Object *obj = data; @@ -1784,7 +1752,7 @@ _resource_deleted(void *data, const Eo_Event *event) ELM_FILESELECTOR_DATA_GET(obj, sd); if (!sd || !sd->monitoring || sd->model != event->object) - return ECORE_CALLBACK_PASS_ON; + return; if (sd->mode == ELM_FILESELECTOR_LIST) { @@ -1852,10 +1820,10 @@ _resource_deleted(void *data, const Eo_Event *event) elm_object_text_set(sd->name_entry, ""); } - return ECORE_CALLBACK_PASS_ON; + return; } -static Eina_Bool +static void _preedit_cb(void *data, const Eo_Event *event) { ELM_FILESELECTOR_DATA_GET(data, sd); @@ -1864,8 +1832,6 @@ _preedit_cb(void *data, const Eo_Event *event) if (sd->search_string && sd->model) _populate(data, sd->model, NULL, NULL); - - return EINA_TRUE; } EOLIAN static void diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index 23e53e306d..ff18f2d15b 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -84,7 +84,7 @@ _replace_path_then_error(void *data, Eina_Error err EINA_UNUSED) eina_stringshare_replace(&sd->fsd.path, NULL); } -static Eina_Bool +static void _selection_done(void *data, const Eo_Event *event) { Elm_Fileselector_Button_Data *sd = data; @@ -109,8 +109,6 @@ _selection_done(void *data, const Eo_Event *event) // EVENTS: should not call legacy //eo_event_callback_call // (sd->obj, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN, (void *)model); - - return EINA_TRUE; } @@ -209,12 +207,10 @@ _activate(Elm_Fileselector_Button_Data *sd) } } -static Eina_Bool +static void _button_clicked(void *data, const Eo_Event *event EINA_UNUSED) { _activate(data); - - return EINA_TRUE; } EOLIAN static void diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index e15414b6ab..970c5bcbe1 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -46,12 +46,10 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = #undef ELM_PRIV_FILESELECTOR_ENTRY_SIGNALS #define SIG_FWD(name, event) \ - static Eina_Bool \ + static void \ _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \ { \ eo_event_callback_call(data, event, ev->info); \ - \ - return EINA_TRUE; \ } SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED) SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS) @@ -84,13 +82,13 @@ _file_chosen_path_then(void *data, void *v) free(s); } -static Eina_Bool +static void _FILE_CHOSEN_fwd(void *data, const Eo_Event *event) { Efl_Model *model = event->info; Eina_Promise *promise = NULL; - if (!model) return EINA_TRUE; + if (!model) return; promise = efl_model_property_get(model, "path"); eina_promise_then(promise, _file_chosen_path_then, NULL, data); @@ -98,8 +96,6 @@ _FILE_CHOSEN_fwd(void *data, const Eo_Event *event) // EVENTS: should not call legacy //eo_event_callback_call // (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->info); - - return EINA_TRUE; } // EVENTS: should not need this function @@ -114,7 +110,7 @@ _FILE_CHOSEN_fwd_path(void *data, Evas_Object *obj EINA_UNUSED, void *event_info _FILE_CHOSEN_fwd(data, &e); } -static Eina_Bool +static void _ACTIVATED_fwd(void *data, const Eo_Event *event) { const char *file; @@ -138,8 +134,6 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event) eo_event_callback_call (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->info); - - return EINA_TRUE; } static void diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index 43d91677c6..fc3b4ba249 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -109,7 +109,7 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd) return EINA_TRUE; } -static Eina_Bool +static void _on_hover_clicked(void *data, const Eo_Event *event) { const char *dismissstr; @@ -118,8 +118,6 @@ _on_hover_clicked(void *data, const Eo_Event *event) if (!dismissstr || strcmp(dismissstr, "on")) elm_hoversel_hover_end(data); // for backward compatibility - - return EINA_TRUE; } static void @@ -153,7 +151,7 @@ _auto_update(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void } } -static Eina_Bool +static void _on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { Elm_Hoversel_Item_Data *item = data; @@ -168,28 +166,22 @@ _on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item); elm_hoversel_hover_end(obj2); - - return EINA_TRUE; } -static Eina_Bool +static void _item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { Elm_Hoversel_Item_Data *it = data; eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it)); - - return EINA_TRUE; } -static Eina_Bool +static void _item_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { Elm_Hoversel_Item_Data *it = data; eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it)); - - return EINA_TRUE; } static void @@ -440,20 +432,16 @@ _activate(Evas_Object *obj) evas_object_show(sd->hover); } -static Eina_Bool +static void _on_clicked(void *data, const Eo_Event *event EINA_UNUSED) { _activate(data); - - return EINA_TRUE; } -static Eina_Bool +static void _on_parent_del(void *data, const Eo_Event *ev EINA_UNUSED) { elm_hoversel_hover_parent_set(data, NULL); - - return EINA_TRUE; } EOLIAN static void @@ -550,14 +538,12 @@ _on_move_resize(void * data, _resizing_eval(obj, sd); } -static Eina_Bool +static void _on_parent_resize(void *data, const Eo_Event *ev EINA_UNUSED) { Evas_Object *obj = (Evas_Object *)data; ELM_HOVERSEL_DATA_GET(obj, sd); _on_move_resize(sd, NULL, obj, NULL); - - return EINA_TRUE; } EOLIAN static void diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index e19ea287a9..5932ca2824 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -45,14 +45,10 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {NULL, NULL} }; -static Eina_Bool -_entry_changed_cb(void *data, const Eo_Event *event); -static Eina_Bool -_entry_focus_in_cb(void *data, const Eo_Event *event); -static Eina_Bool -_entry_focus_out_cb(void *data, const Eo_Event *event); -static Eina_Bool -_entry_clicked_cb(void *data, const Eo_Event *event); +static void _entry_changed_cb(void *data, const Eo_Event *event); +static void _entry_focus_in_cb(void *data, const Eo_Event *event); +static void _entry_focus_out_cb(void *data, const Eo_Event *event); +static void _entry_clicked_cb(void *data, const Eo_Event *event); EO_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb, { ELM_MULTIBUTTONENTRY_EVENT_CHANGED, _entry_changed_cb }, @@ -1039,23 +1035,21 @@ _entry_resize_cb(void *data, elm_widget_show_region_set(sd->entry, en_x, en_y, en_w, en_h, EINA_TRUE); } -static Eina_Bool +static void _entry_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) { - ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); + ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); const char *str; str = elm_object_text_get(sd->entry); sd->n_str = str ? strlen(str) : 0; - - return EINA_TRUE; } -static Eina_Bool +static void _entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED) { Elm_Multibuttonentry_Item_Data *item = NULL; - ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); + ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); if (sd->selected_it) { @@ -1063,32 +1057,26 @@ _entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED) elm_object_focus_set(sd->entry, EINA_FALSE); elm_object_focus_set(VIEW(item), EINA_TRUE); } - - return EINA_TRUE; } -static Eina_Bool +static void _entry_focus_out_cb(void *data, const Eo_Event *event EINA_UNUSED) { - ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); + ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); const char *str; str = elm_object_text_get(sd->entry); if (str && str[0]) _item_new(sd, str, MULTIBUTTONENTRY_POS_END, NULL, NULL, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _entry_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) { - ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); + ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd); _current_item_state_change(sd->parent, MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT); elm_object_focus_set(sd->entry, EINA_TRUE); - - return EINA_TRUE; } static void diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 8b6a720851..7f53e7dbb4 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -42,7 +42,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {NULL, NULL} }; -static Eina_Bool _on_item_back_btn_clicked(void *data, const Eo_Event *event); +static void _on_item_back_btn_clicked(void *data, const Eo_Event *event); static Eina_Bool _key_action_top_item_get(Evas_Object *obj, const char *params); @@ -953,7 +953,7 @@ _elm_naviframe_elm_layout_sizing_eval(Eo *obj, Elm_Naviframe_Data *sd) evas_object_size_hint_max_set(obj, -1, -1); } -static Eina_Bool +static void _on_item_back_btn_clicked(void *data, const Eo_Event *event) { /* Since edje has the event queue, clicked event could be happened @@ -962,8 +962,6 @@ _on_item_back_btn_clicked(void *data, const Eo_Event *event) page. */ eo_event_callback_del(event->object, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, data); elm_naviframe_item_pop(data); - - return EINA_TRUE; } static Evas_Object * @@ -1415,7 +1413,7 @@ _send_signal(Elm_Naviframe_Item_Data *it, const char *sig) edje_object_message_signal_process(elm_layout_edje_get(VIEW(it))); } -static Eina_Bool +static void _deferred(void *data, const Eo_Event *event EINA_UNUSED) { Elm_Naviframe_Data *nfd = data; @@ -1442,7 +1440,6 @@ _deferred(void *data, const Eo_Event *event EINA_UNUSED) } eo_event_callback_del(nfd->obj, EFL_EVENT_ANIMATOR_TICK, _deferred, nfd); - return EO_CALLBACK_CONTINUE; } EOLIAN static void diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index 9c3c9244da..a4e9551ee2 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -60,20 +60,13 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { { NULL, NULL } }; -static Eina_Bool -_update_frame(void *data, const Eo_Event *event); -static Eina_Bool -_update_slider(void *data, const Eo_Event *event); -static Eina_Bool -_play_started(void *data, const Eo_Event *event); -static Eina_Bool -_play_finished(void *data, const Eo_Event *event); -static Eina_Bool -_update_position(void *data, const Eo_Event *event); -static Eina_Bool -_drag_start(void *data, const Eo_Event *event); -static Eina_Bool -_drag_stop(void *data, const Eo_Event *event); +static void _update_frame(void *data, const Eo_Event *event); +static void _update_slider(void *data, const Eo_Event *event); +static void _play_started(void *data, const Eo_Event *event); +static void _play_finished(void *data, const Eo_Event *event); +static void _update_position(void *data, const Eo_Event *event); +static void _drag_start(void *data, const Eo_Event *event); +static void _drag_stop(void *data, const Eo_Event *event); static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); static Eina_Bool _key_action_play(Evas_Object *obj, const char *params); @@ -244,14 +237,14 @@ _elm_player_elm_layout_sizing_eval(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) evas_object_size_hint_min_set(obj, w, h); } -static Eina_Bool +static void _update_slider(void *data, const Eo_Event *event EINA_UNUSED) { double pos, length; Eina_Bool seekable; ELM_PLAYER_DATA_GET(data, sd); - if (!sd) return EINA_TRUE; + if (!sd) return; seekable = elm_video_is_seekable_get(sd->video); length = elm_video_play_length_get(sd->video); @@ -263,21 +256,17 @@ _update_slider(void *data, const Eo_Event *event EINA_UNUSED) if ((elm_slider_value_get(sd->slider) != pos) && (!sd->dragging)) elm_slider_value_set(sd->slider, pos); - - return EINA_TRUE; } -static Eina_Bool +static void _update_frame(void *data, const Eo_Event *event) { ELM_PLAYER_DATA_GET(data, sd); - if (!sd) return EINA_TRUE; + if (!sd) return; _update_slider(data, event); - - return EINA_TRUE; } -static Eina_Bool +static void _update_position(void *data, const Eo_Event *event EINA_UNUSED) { double pos; @@ -286,29 +275,23 @@ _update_position(void *data, const Eo_Event *event EINA_UNUSED) pos = elm_slider_value_get(sd->slider); if (pos != elm_video_play_position_get(sd->video)) elm_video_play_position_set(sd->video, pos); - - return EINA_TRUE; } -static Eina_Bool +static void _drag_start(void *data, const Eo_Event *event EINA_UNUSED) { ELM_PLAYER_DATA_GET(data, sd); sd->dragging = EINA_TRUE; - - return EINA_TRUE; } -static Eina_Bool +static void _drag_stop(void *data, const Eo_Event *event EINA_UNUSED) { ELM_PLAYER_DATA_GET(data, sd); sd->dragging = EINA_FALSE; - - return EINA_TRUE; } -static Eina_Bool +static void _update_volume(void *data, const Eo_Event *event EINA_UNUSED) { double vol; @@ -317,11 +300,9 @@ _update_volume(void *data, const Eo_Event *event EINA_UNUSED) vol = elm_slider_value_get(sd->vslider) / 100.0; if (vol != elm_video_audio_level_get(sd->video)) elm_video_audio_level_set(sd->video, vol); - - return EINA_TRUE; } -static Eina_Bool +static void _forward(void *data, const Eo_Event *event EINA_UNUSED) { double pos, length; @@ -335,29 +316,23 @@ _forward(void *data, const Eo_Event *event EINA_UNUSED) elm_layout_signal_emit(data, "elm,button,forward", "elm"); eo_event_callback_call(data, ELM_PLAYER_EVENT_FORWARD_CLICKED, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _info(void *data, const Eo_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,button,info", "elm"); eo_event_callback_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _next(void *data, const Eo_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,button,next", "elm"); eo_event_callback_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _pause(void *data, const Eo_Event *event EINA_UNUSED) { ELM_PLAYER_DATA_GET(data, sd); @@ -365,11 +340,9 @@ _pause(void *data, const Eo_Event *event EINA_UNUSED) elm_layout_signal_emit(data, "elm,player,pause", "elm"); elm_video_pause(sd->video); eo_event_callback_call(data, ELM_PLAYER_EVENT_PAUSE_CLICKED, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _play(void *data, const Eo_Event *event EINA_UNUSED) { ELM_PLAYER_DATA_GET(data, sd); @@ -377,20 +350,16 @@ _play(void *data, const Eo_Event *event EINA_UNUSED) elm_layout_signal_emit(data, "elm,player,play", "elm"); elm_video_play(sd->video); eo_event_callback_call(data, ELM_PLAYER_EVENT_PLAY_CLICKED, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _prev(void *data, const Eo_Event *event EINA_UNUSED) { eo_event_callback_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL); elm_layout_signal_emit(data, "elm,button,prev", "elm"); - - return EINA_TRUE; } -static Eina_Bool +static void _rewind(void *data, const Eo_Event *event EINA_UNUSED) { double pos; @@ -403,20 +372,16 @@ _rewind(void *data, const Eo_Event *event EINA_UNUSED) elm_layout_signal_emit(data, "elm,button,rewind", "elm"); eo_event_callback_call(data, ELM_PLAYER_EVENT_REWIND_CLICKED, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _stop(void *data, const Eo_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,button,stop", "elm"); eo_event_callback_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _eject(void *data, const Eo_Event *event EINA_UNUSED) { ELM_PLAYER_DATA_GET(data, sd); @@ -424,8 +389,6 @@ _eject(void *data, const Eo_Event *event EINA_UNUSED) elm_layout_signal_emit(data, "elm,button,eject", "elm"); emotion_object_eject(elm_video_emotion_get(sd->video)); eo_event_callback_call(data, ELM_PLAYER_EVENT_EJECT_CLICKED, NULL); - - return EINA_TRUE; } static void @@ -445,40 +408,32 @@ _mute_toggle(Evas_Object *obj) } } -static Eina_Bool +static void _volume(void *data, const Eo_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,button,volume", "elm"); _mute_toggle(data); eo_event_callback_call(data, ELM_PLAYER_EVENT_VOLUME_CLICKED, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _mute(void *data, const Eo_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,button,mute", "elm"); _mute_toggle(data); eo_event_callback_call(data, ELM_PLAYER_EVENT_MUTE_CLICKED, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _play_started(void *data, const Eo_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,player,play", "elm"); - - return EINA_TRUE; } -static Eina_Bool +static void _play_finished(void *data, const Eo_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,player,pause", "elm"); - - return EINA_TRUE; } static void diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 97d8c5b11b..7e2861f777 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -49,13 +49,10 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params); static void _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); -static Eina_Bool -_block_clicked_cb(void *data, const Eo_Event *event); -static Eina_Bool -_timeout_cb(void *data, const Eo_Event *event); +static void _block_clicked_cb(void *data, const Eo_Event *event); +static void _timeout_cb(void *data, const Eo_Event *event); -static Eina_Bool -_hide_effect_finished_cb(void *data, const Eo_Event *event); +static void _hide_effect_finished_cb(void *data, const Eo_Event *event); static const Elm_Action key_actions[] = { {"move", _key_action_move}, @@ -104,29 +101,23 @@ _visuals_set(Evas_Object *obj) edje_object_message_signal_process(elm_layout_edje_get(sd->main_layout)); } -static Eina_Bool +static void _block_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) { eo_event_callback_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _timeout_cb(void *data, const Eo_Event *event EINA_UNUSED) { evas_object_hide(data); eo_event_callback_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _hide_effect_finished_cb(void *data, const Eo_Event *event EINA_UNUSED) { eo_event_callback_call(data, ELM_POPUP_EVENT_DISMISSED, NULL); - - return EINA_TRUE; } @@ -895,24 +886,20 @@ _elm_popup_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED, Elm_Popup_Ite elm_layout_signal_emit(VIEW(it), emission, source); } -static Eina_Bool +static void _item_focused_cb(void *data, const Eo_Event *event EINA_UNUSED) { Elm_Popup_Item_Data *it = data; eo_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_FOCUSED, EO_OBJ(it)); - - return EINA_TRUE; } -static Eina_Bool +static void _item_unfocused_cb(void *data, const Eo_Event *event EINA_UNUSED) { Elm_Popup_Item_Data *it = data; eo_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_UNFOCUSED, EO_OBJ(it)); - - return EINA_TRUE; } EOLIAN static Eo * diff --git a/src/lib/elementary/elm_app_server.c b/src/lib/elementary/elm_app_server.c index 4899388846..2c426cb24a 100644 --- a/src/lib/elementary/elm_app_server.c +++ b/src/lib/elementary/elm_app_server.c @@ -28,12 +28,11 @@ typedef struct } image_raw; } Elm_App_Server_Data; -static Eina_Bool +static void _view_del_cb(void *data, const Eo_Event *event) { Elm_App_Server_Data *cdata = data; eina_hash_del(cdata->views, NULL, event->object); - return EINA_TRUE; } static Eina_Bool diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index c49568d1df..caf2c39bb4 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c @@ -115,17 +115,17 @@ static Eo *_instance; static int _init_count = 0; // Object Event handlers -static Eina_Bool _state_changed_signal_send(void *data, const Eo_Event *event); -static Eina_Bool _property_changed_signal_send(void *data, const Eo_Event *event); -static Eina_Bool _children_changed_signal_send(void *data, const Eo_Event *event); -static Eina_Bool _window_signal_send(void *data, const Eo_Event *event); -static Eina_Bool _visible_data_changed_signal_send(void *data, const Eo_Event *event); -static Eina_Bool _active_descendant_changed_signal_send(void *data, const Eo_Event *event); -static Eina_Bool _selection_signal_send(void *data, const Eo_Event *event); -static Eina_Bool _text_text_inserted_send(void *data, const Eo_Event *event); -static Eina_Bool _text_text_removed_send(void *data, const Eo_Event *event); -static Eina_Bool _text_caret_moved_send(void *data, const Eo_Event *event); -static Eina_Bool _text_selection_changed_send(void *data, const Eo_Event *event); +static void _state_changed_signal_send(void *data, const Eo_Event *event); +static void _property_changed_signal_send(void *data, const Eo_Event *event); +static void _children_changed_signal_send(void *data, const Eo_Event *event); +static void _window_signal_send(void *data, const Eo_Event *event); +static void _visible_data_changed_signal_send(void *data, const Eo_Event *event); +static void _active_descendant_changed_signal_send(void *data, const Eo_Event *event); +static void _selection_signal_send(void *data, const Eo_Event *event); +static void _text_text_inserted_send(void *data, const Eo_Event *event); +static void _text_text_removed_send(void *data, const Eo_Event *event); +static void _text_caret_moved_send(void *data, const Eo_Event *event); +static void _text_selection_changed_send(void *data, const Eo_Event *event); // bridge private methods static void _bridge_object_register(Eo *bridge, Eo *obj); @@ -139,8 +139,8 @@ static void _bridge_iter_object_reference_append(Eo *bridge, Eldbus_Message_Iter static void _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj); static Eina_Bool _elm_atspi_bridge_key_filter(void *data, void *loop, int type, void *event); static void _object_desktop_reference_append(Eldbus_Message_Iter *iter); -static Eina_Bool _on_object_add(void *data, const Eo_Event *event); -static Eina_Bool _on_object_del(void *data, const Eo_Event *event); +static void _on_object_add(void *data, const Eo_Event *event); +static void _on_object_del(void *data, const Eo_Event *event); typedef struct { const Eo_Event_Description *desc; @@ -3799,35 +3799,40 @@ _handle_listener_change(void *data, const Eldbus_Message *msg EINA_UNUSED) _registered_events_list_update(data); } -static Eina_Bool +static void _state_changed_signal_send(void *data, const Eo_Event *event) { Elm_Atspi_Event_State_Changed_Data *state_data = event->info; const char *type_desc; - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); if (!STATE_TYPE_GET(pd->object_state_broadcast_mask, state_data->type)) - return EINA_FALSE; + { + eo_event_callback_stop(event->object); + return; + } if ((state_data->type > ELM_ATSPI_STATE_LAST_DEFINED) || (int)state_data->type < 0) - return EINA_FALSE; + { + eo_event_callback_stop(event->object); + return; + } type_desc = elm_states_to_atspi_state[state_data->type].name; _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_STATE_CHANGED], type_desc, state_data->new_value, 0, NULL); - return EINA_TRUE; } -static Eina_Bool +static void _property_changed_signal_send(void *data, const Eo_Event *event) { const char *property = event->info; char *atspi_desc; enum _Atspi_Object_Property prop = ATSPI_OBJECT_PROPERTY_LAST; - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); if (!strcmp(property, "parent")) { @@ -3857,54 +3862,58 @@ _property_changed_signal_send(void *data, const Eo_Event *event) if (prop == ATSPI_OBJECT_PROPERTY_LAST) { ERR("Unrecognized property name!"); - return EINA_FALSE; + eo_event_callback_stop(event->object); + return; } if (!STATE_TYPE_GET(pd->object_property_broadcast_mask, prop)) { DBG("Masking property %s changed event.", property); - return EINA_FALSE; + eo_event_callback_stop(event->object); + return; } _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_PROPERTY_CHANGED], atspi_desc, 0, 0, NULL, NULL); - return EINA_TRUE; } -static Eina_Bool +static void _visible_data_changed_signal_send(void *data, const Eo_Event *event) { - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED)) - return EINA_FALSE; + { + eo_event_callback_stop(event->object); + return; + } _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED], "", 0, 0, NULL, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _active_descendant_changed_signal_send(void *data, const Eo_Event *event) { Eo *child = event->info; int idx; - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED)) - return EINA_FALSE; + { + eo_event_callback_stop(event->object); + return; + } idx = elm_interface_atspi_accessible_index_in_parent_get(child); _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "", idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), child); - return EINA_TRUE; } -static Eina_Bool +static void _children_changed_signal_send(void *data, const Eo_Event *event) { const char *atspi_desc = NULL; @@ -3912,12 +3921,15 @@ _children_changed_signal_send(void *data, const Eo_Event *event) int idx; enum _Atspi_Object_Child_Event_Type type; - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); type = ev_data->is_added ? ATSPI_OBJECT_CHILD_ADDED : ATSPI_OBJECT_CHILD_REMOVED; if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, type)) - return EINA_FALSE; + { + eo_event_callback_stop(event->object); + return; + } switch (type) { @@ -3931,21 +3943,23 @@ _children_changed_signal_send(void *data, const Eo_Event *event) break; } - if (!atspi_desc) return EINA_FALSE; + if (!atspi_desc) + { + eo_event_callback_stop(event->object); + return; + } _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc, idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child); - - return EINA_TRUE; } -static Eina_Bool +static void _window_signal_send(void *data, const Eo_Event *event) { enum _Atspi_Window_Signals type; - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_CREATED) type = ATSPI_WINDOW_EVENT_CREATE; @@ -3962,33 +3976,41 @@ _window_signal_send(void *data, const Eo_Event *event) else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED) type = ATSPI_WINDOW_EVENT_RESTORE; else - return EINA_FALSE; + { + eo_event_callback_stop(event->object); + return; + } if (!STATE_TYPE_GET(pd->window_signal_broadcast_mask, type)) - return EINA_FALSE; + { + eo_event_callback_stop(event->object); + return; + } if (!pd->a11y_bus) { ERR("A11Y connection closed. Unable to send ATSPI event."); - return EINA_FALSE; + eo_event_callback_stop(event->object); + return; } _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_WINDOW, &_window_obj_signals[type], "", 0, 0, "i", 0); - return EINA_TRUE; } -static Eina_Bool +static void _selection_signal_send(void *data, const Eo_Event *event) { - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_SELECTION_CHANGED)) - return EINA_FALSE; + { + eo_event_callback_stop(event->object); + return; + } _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_SELECTION_CHANGED], "", 0, 0, "i", 0); - return EINA_TRUE; } static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eldbus_Signal *signal, const char *minor, unsigned int det1, unsigned int det2, const char *variant_sig, ...) @@ -4074,68 +4096,60 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld DBG("Send %s.%s[%s,%d,%d]", infc, signal->name, minor, det1, det2); } -static Eina_Bool +static void _text_caret_moved_send(void *data, const Eo_Event *event) { int cursor_pos = 0; - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED)) - return EINA_TRUE; + return; cursor_pos = elm_interface_atspi_text_caret_offset_get(event->object); _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED], "", cursor_pos, 0, NULL, NULL); - - return EINA_TRUE; } -static Eina_Bool +static void _text_text_inserted_send(void *data, const Eo_Event *event) { Elm_Atspi_Text_Change_Info *info = event->info; - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED)) - return EINA_TRUE; + return; _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "insert", info->pos, info->len, "s", info->content); - - return EINA_TRUE; } -static Eina_Bool +static void _text_text_removed_send(void *data, const Eo_Event *event) { Elm_Atspi_Text_Change_Info *info = event->info; - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED)) - return EINA_TRUE; + return; _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "delete", info->pos, info->len, "s", info->content); - - return EINA_TRUE; } -static Eina_Bool +static void _text_selection_changed_send(void *data, const Eo_Event *event) { - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED)) - return EINA_TRUE; + return; _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED], "", 0, 0, NULL, NULL); - - return EINA_TRUE; } static void @@ -4160,29 +4174,27 @@ _bridge_object_unregister(Eo *bridge, Eo *obj) eina_hash_del(pd->cache, &obj, obj); } -static Eina_Bool +static void _on_object_add(void *data, const Eo_Event *event) { Eldbus_Message *sig; Eldbus_Message_Iter *iter; - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_ADDED); iter = eldbus_message_iter_get(sig); _cache_item_reference_append_cb(data, event->object, iter); eldbus_service_signal_send(pd->cache_interface, sig); - - return EINA_TRUE; } -static Eina_Bool +static void _on_object_del(void *data, const Eo_Event *event) { Eldbus_Message *sig; - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); _bridge_object_unregister(data, event->object); @@ -4190,8 +4202,6 @@ _on_object_del(void *data, const Eo_Event *event) Eldbus_Message_Iter *iter = eldbus_message_iter_get(sig); _bridge_iter_object_reference_append(data, iter, event->object); eldbus_service_signal_send(pd->cache_interface, sig); - - return EINA_TRUE; } static void @@ -4315,10 +4325,10 @@ _interfaces_register(Eo *bridge) eldbus_service_object_data_set(pd->interfaces.value, ELM_ATSPI_BRIDGE_CLASS_NAME, bridge); } -static Eina_Bool +static void _bridge_accessible_event_dispatch(void *data, const Eo_Event *event) { - ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); + ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); _bridge_object_register(data, event->object); diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index 816fac982a..cbba1960b9 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -29,24 +29,20 @@ _elm_box_list_data_get(const Eina_List *list) return opt->obj; } -static Eina_Bool +static void _child_added_cb_proxy(void *data, const Eo_Event *event) { Evas_Object *box = data; Evas_Object_Box_Option *opt = event->info; eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj); - - return EINA_TRUE; } -static Eina_Bool +static void _child_removed_cb_proxy(void *data, const Eo_Event *event) { Evas_Object *box = data; Evas_Object *child = event->info; eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child); - - return EINA_TRUE; } EOLIAN static Eina_Bool @@ -193,7 +189,7 @@ _transition_animation(void *data) return ECORE_CALLBACK_RENEW; } -static Eina_Bool +static void _transition_layout_child_added(void *data, const Eo_Event *event) { Transition_Animation_Data *tad; @@ -201,16 +197,14 @@ _transition_layout_child_added(void *data, const Eo_Event *event) Elm_Box_Transition *layout_data = data; tad = calloc(1, sizeof(Transition_Animation_Data)); - if (!tad) return EINA_TRUE; + if (!tad) return; tad->obj = opt->obj; layout_data->objs = eina_list_append(layout_data->objs, tad); layout_data->recalculate = EINA_TRUE; - - return EINA_TRUE; } -static Eina_Bool +static void _transition_layout_child_removed(void *data, const Eo_Event *event) { Eina_List *l; @@ -227,8 +221,6 @@ _transition_layout_child_removed(void *data, const Eo_Event *event) break; } } - - return EINA_TRUE; } static void diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c index eafdffc411..d261a7488b 100644 --- a/src/lib/elementary/elm_cnp.c +++ b/src/lib/elementary/elm_cnp.c @@ -1771,13 +1771,12 @@ _x11_dnd_status(void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev) return EINA_TRUE; } -static Eina_Bool +static void _x11_win_rotation_changed_cb(void *data, const Eo_Event *event) { Evas_Object *win = data; int rot = elm_win_rotation_get(event->object); elm_win_rotation_set(win, rot); - return EINA_TRUE; } static Eina_Bool diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c index 7deac92bca..d31c667a68 100644 --- a/src/lib/elementary/elm_code_widget.c +++ b/src/lib/elementary/elm_code_widget.c @@ -448,7 +448,7 @@ _elm_code_widget_fill(Elm_Code_Widget *widget) _elm_code_widget_fill_range(widget, 1, elm_code_file_lines_get(pd->code->file), NULL); } -static Eina_Bool +static void _elm_code_widget_line_cb(void *data, const Eo_Event *event) { Elm_Code_Line *line; @@ -458,11 +458,9 @@ _elm_code_widget_line_cb(void *data, const Eo_Event *event) widget = (Elm_Code_Widget *)data; _elm_code_widget_refresh(widget, line); - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _elm_code_widget_file_cb(void *data, const Eo_Event *event EINA_UNUSED) { Elm_Code_Widget *widget; @@ -470,10 +468,9 @@ _elm_code_widget_file_cb(void *data, const Eo_Event *event EINA_UNUSED) widget = (Elm_Code_Widget *)data; _elm_code_widget_fill(widget); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _elm_code_widget_selection_cb(void *data, const Eo_Event *event EINA_UNUSED) { Elm_Code_Widget *widget; @@ -481,10 +478,9 @@ _elm_code_widget_selection_cb(void *data, const Eo_Event *event EINA_UNUSED) widget = (Elm_Code_Widget *)data; _elm_code_widget_refresh(widget, NULL); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _elm_code_widget_selection_clear_cb(void *data, const Eo_Event *event EINA_UNUSED) { Elm_Code_Widget *widget; @@ -492,7 +488,6 @@ _elm_code_widget_selection_clear_cb(void *data, const Eo_Event *event EINA_UNUSE widget = (Elm_Code_Widget *)data; _elm_code_widget_fill(widget); - return EO_CALLBACK_CONTINUE; } static void diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c index 02c2d25b1b..979d3e171b 100644 --- a/src/lib/elementary/elm_color_class.c +++ b/src/lib/elementary/elm_color_class.c @@ -127,7 +127,7 @@ _colorclass_select(void *data, Evas_Object *obj EINA_UNUSED, const char *sig, co cc->current->color[cc->num].b, cc->current->color[cc->num].a); } -static Eina_Bool +static void _colorclass_changed(void *data, const Eo_Event *event EINA_UNUSED) { Colorclass_UI *cc = data; @@ -148,16 +148,19 @@ _colorclass_changed(void *data, const Eo_Event *event EINA_UNUSED) _colorclass_cc_update(cc, cc->num); cc->change_reset = 0; cc->changed = 1; - return EINA_TRUE; } -static Eina_Bool +static void _colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED) { Colorclass_UI *cc = data; Colorclass color; - if (!cc->current) return EINA_FALSE; + if (!cc->current) + { + eo_event_callback_stop(event->object); + return; + } //if (cc->winid && remote_iface) //{ //Eldbus_Message *msg; @@ -167,7 +170,8 @@ _colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED) //eldbus_message_arguments_append(msg, "s", cc->current->name); //eldbus_service_signal_send(remote_iface, msg); //cc->change_reset = 1; - //return EINA_FALSE; + //eo_event_callback_stop(event->object); + //return; //} edje_color_class_del(cc->current->name); edje_color_class_get(cc->current->name, @@ -186,10 +190,9 @@ _colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED) _colorclass_cc_update(cc, 0); _colorclass_cc_update(cc, 1); _colorclass_cc_update(cc, 2); - return EINA_TRUE; } -static Eina_Bool +static void _colorclass_activate(void *data, const Eo_Event *event) { Colorclass_UI *cc = data; @@ -226,7 +229,6 @@ _colorclass_activate(void *data, const Eo_Event *event) elm_colorselector_color_set(cc->cs, cc->current->color[0].r, cc->current->color[0].g, cc->current->color[0].b, cc->current->color[0].a); elm_layout_signal_emit(cc->ly, "elm,colors,show", "elm"); - return EINA_TRUE; } static void diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 8de5825f0a..abda3735e9 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -634,7 +634,7 @@ _colors_set(Evas_Object *obj, eo_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL); } -static Eina_Bool +static void _spinner_changed_cb(void *data, const Eo_Event *event) { Elm_Colorselector_Data *sd = data; @@ -664,8 +664,6 @@ _spinner_changed_cb(void *data, const Eo_Event *event) } evas_object_data_del(event->object, "_changed"); eo_event_callback_call(parent, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL); - - return EINA_TRUE; } #ifdef HAVE_ELEMENTARY_X @@ -694,7 +692,7 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj) return xwin; } -static Eina_Bool +static void _start_grab_pick_cb(void *data, const Eo_Event *event) { Evas_Object *o = data; @@ -709,8 +707,6 @@ _start_grab_pick_cb(void *data, const Eo_Event *event) ecore_x_keyboard_grab(sd->grab.xroot); ecore_x_pointer_grab(sd->grab.xroot); - - return EINA_TRUE; } static Eina_Bool @@ -1011,7 +1007,7 @@ _colorbar_move_cb(void *data, _colorbar_arrow_set(cb_data, ev->cur.canvas.x); } -static Eina_Bool +static void _button_clicked_cb(void *data, const Eo_Event *event) { Color_Bar_Data *cb_data = data; @@ -1052,11 +1048,9 @@ _button_clicked_cb(void *data, const Eo_Event *event) _update_hsla_from_colorbar(cb_data->parent, cb_data->color_type, x); sd->sel_color_type = cb_data->color_type; sd->focused = ELM_COLORSELECTOR_COMPONENTS; - - return EINA_TRUE; } -static Eina_Bool +static void _button_repeat_cb(void *data, const Eo_Event *event EINA_UNUSED) { Color_Bar_Data *cb_data = data; @@ -1073,8 +1067,6 @@ _button_repeat_cb(void *data, const Eo_Event *event EINA_UNUSED) edje_object_part_drag_value_set(cb_data->colorbar, "elm.arrow", x, y); _update_hsla_from_colorbar(cb_data->parent, cb_data->color_type, x); - - return EINA_TRUE; } static void diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index 3d359b3be6..c512aa5a13 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -352,7 +352,7 @@ _land_indicator_connect_cb(void *data) return ECORE_CALLBACK_RENEW; } -static Eina_Bool +static void _land_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED) { Evas_Object *conform = data; @@ -361,10 +361,9 @@ _land_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED) sd->land_indi_timer = ecore_timer_add(ELM_CONFORM_INDICATOR_TIME, _land_indicator_connect_cb, conform); - return EINA_TRUE; } -static Eina_Bool +static void _port_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED) { Evas_Object *conform = data; @@ -373,7 +372,6 @@ _port_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED) sd->port_indi_timer = ecore_timer_add(ELM_CONFORM_INDICATOR_TIME, _port_indicator_connect_cb, conform); - return EINA_TRUE; } static Evas_Object * @@ -510,7 +508,7 @@ _indicator_opacity_set(Evas_Object *conformant, Elm_Win_Indicator_Opacity_Mode i //TODO: opacity change } -static Eina_Bool +static void _on_indicator_mode_changed(void *data, const Eo_Event *event) { Evas_Object *conformant = data; @@ -527,10 +525,9 @@ _on_indicator_mode_changed(void *data, const Eo_Event *event) _indicator_mode_set(conformant, indmode); if (ind_o_mode != sd->ind_o_mode) _indicator_opacity_set(conformant, ind_o_mode); - return EINA_TRUE; } -static Eina_Bool +static void _on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED) { int rot = 0; @@ -542,12 +539,12 @@ _on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED) rot = elm_win_rotation_get(win); - if (rot == sd->rot) return EINA_TRUE; + if (rot == sd->rot) return; sd->rot = rot; old_indi = elm_layout_content_unset(conformant, INDICATOR_PART); /* this means ELM_WIN_INDICATOR_SHOW never be set.we don't need to change indicator type*/ - if (!old_indi) return EINA_TRUE; + if (!old_indi) return; evas_object_hide(old_indi); if ((rot == 90) || (rot == 270)) @@ -555,7 +552,7 @@ _on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED) if (!sd->landscape_indicator) sd->landscape_indicator = _create_landscape_indicator(conformant); - if (!sd->landscape_indicator) return EINA_TRUE; + if (!sd->landscape_indicator) return; evas_object_show(sd->landscape_indicator); evas_object_data_set(sd->landscape_indicator, CONFORMANT_KEY, (void *) (intptr_t) rot); @@ -566,13 +563,12 @@ _on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED) if (!sd->portrait_indicator) sd->portrait_indicator = _create_portrait_indicator(conformant); - if (!sd->portrait_indicator) return EINA_TRUE; + if (!sd->portrait_indicator) return; evas_object_show(sd->portrait_indicator); evas_object_data_set(sd->portrait_indicator, CONFORMANT_KEY, (void *) (intptr_t) rot); elm_layout_content_set(conformant, INDICATOR_PART, sd->portrait_indicator); } - return EINA_TRUE; } EOLIAN static Eina_Bool diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index 496be05271..0102a23c7c 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -194,14 +194,12 @@ _item_signal_emit_cb(void *data, eina_stringshare_replace(&it->day_style, emission); } -static Eina_Bool +static void _item_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) { Elm_Dayselector_Item_Data *it = data; eo_event_callback_call(WIDGET(it), EFL_UI_CHECK_EVENT_CHANGED, (void *)it->day); - - return EINA_TRUE; } static Elm_Dayselector_Item_Data * diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 3582780e52..c9100daa09 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -302,7 +302,7 @@ _validate(Evas_Object *obj) vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text"); res = eo_event_callback_call(obj, ELM_ENTRY_EVENT_VALIDATE, (void *)&vc); buf = eina_strbuf_new(); - eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EO_CALLBACK_STOP ? "fail" : "pass"); + eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass"); edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm"); eina_tmpstr_del(vc.signal); eina_strbuf_free(buf); @@ -1371,7 +1371,7 @@ _hover_del_job(void *data) sd->hov_deljob = NULL; } -static Eina_Bool +static void _hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED) { ELM_ENTRY_DATA_GET(data, sd); @@ -1390,8 +1390,6 @@ _hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED) elm_widget_scroll_freeze_pop(data); ecore_job_del(sd->hov_deljob); sd->hov_deljob = ecore_job_add(_hover_del_job, data); - - return EINA_TRUE; } static void @@ -2460,12 +2458,10 @@ _anchor_hover_del_cb(void *data, (sd->anchor_hover.hover, EVAS_CALLBACK_DEL, _anchor_hover_del_cb, obj); } -static Eina_Bool +static void _anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) { elm_entry_anchor_hover_end(data); - - return EINA_TRUE; } static void @@ -3929,7 +3925,7 @@ elm_entry_add(Evas_Object *parent) return obj; } -static Eina_Bool +static void _cb_added(void *data EINA_UNUSED, const Eo_Event *ev) { const Eo_Callback_Array_Item *event = ev->info; @@ -3937,10 +3933,9 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev) ELM_ENTRY_DATA_GET(ev->object, sd); if (event->desc == ELM_ENTRY_EVENT_VALIDATE) sd->validators++; - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) { const Eo_Callback_Array_Item *event = ev->info; @@ -3948,7 +3943,7 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) ELM_ENTRY_DATA_GET(ev->object, sd); if (event->desc == ELM_ENTRY_EVENT_VALIDATE) sd->validators--; - return EO_CALLBACK_CONTINUE; + return; } diff --git a/src/lib/elementary/elm_frame.c b/src/lib/elementary/elm_frame.c index 87c06341cf..4e5f02a038 100644 --- a/src/lib/elementary/elm_frame.c +++ b/src/lib/elementary/elm_frame.c @@ -97,12 +97,10 @@ _elm_frame_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd E } } -static Eina_Bool +static void _recalc(void *data, const Eo_Event *event EINA_UNUSED) { elm_layout_sizing_eval(data); - - return EINA_TRUE; } static void diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 3d38929366..18ec3d9ef9 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -2011,7 +2011,7 @@ _item_realize(Elm_Gen_Item *it, edje_object_message_signal_process(VIEW(it)); } -static Eina_Bool +static void _tree_effect_animator_cb(void *data, const Eo_Event *event EINA_UNUSED) { int in = 0; @@ -2167,8 +2167,6 @@ _tree_effect_animator_cb(void *data, const Eo_Event *event EINA_UNUSED) _item_tree_effect_finish(sd); _elm_genlist_tree_effect_stop(sd); } - - return EO_CALLBACK_CONTINUE; } static void diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c index a010c15dc2..dfddc9df31 100644 --- a/src/lib/elementary/elm_glview.c +++ b/src/lib/elementary/elm_glview.c @@ -109,11 +109,11 @@ _elm_glview_efl_canvas_group_group_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coo } } -static Eina_Bool +static void _render_cb(void *obj, const Eo_Event *event EINA_UNUSED) { ELM_GLVIEW_DATA_GET(obj, sd); - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ); evas_object_render_op_set(wd->resize_obj, evas_object_render_op_get(obj)); @@ -151,7 +151,7 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED) // Depending on the policy return true or false if (sd->render_policy == ELM_GLVIEW_RENDER_POLICY_ON_DEMAND) { - return EINA_TRUE; + return; } else if (sd->render_policy == ELM_GLVIEW_RENDER_POLICY_ALWAYS) { @@ -164,7 +164,7 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED) goto on_error; } - return EINA_TRUE; + return; on_error: eo_event_callback_del(ecore_main_loop_get(), @@ -172,7 +172,6 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED) _render_cb, obj); sd->render_idle_enterer = 0; - return EO_CALLBACK_CONTINUE; } static void @@ -318,7 +317,7 @@ _elm_glview_efl_canvas_group_group_del(Eo *obj, Elm_Glview_Data *sd) efl_canvas_group_del(eo_super(obj, MY_CLASS)); } -static Eina_Bool +static void _cb_added(void *data EINA_UNUSED, const Eo_Event *ev) { const Eo_Callback_Array_Item *event = ev->info; @@ -333,8 +332,6 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev) { _set_render_policy_callback(ev->object); } - - return EO_CALLBACK_CONTINUE; } EAPI Evas_Object * diff --git a/src/lib/elementary/elm_helper.c b/src/lib/elementary/elm_helper.c index ca8cd35285..966277daed 100644 --- a/src/lib/elementary/elm_helper.c +++ b/src/lib/elementary/elm_helper.c @@ -38,7 +38,7 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) return validator->status; } -EAPI Eina_Bool +EAPI void elm_validator_regexp_helper(void *data, const Eo_Event *event) { Elm_Validate_Content *vc = event->info; @@ -46,5 +46,6 @@ elm_validator_regexp_helper(void *data, const Eo_Event *event) validator->status = regexec(&validator->regex, vc->text, (size_t)0, NULL, 0) ? ELM_REG_NOMATCH : ELM_REG_NOERROR; vc->signal = validator->signal; - return validator->status ? EO_CALLBACK_STOP : EO_CALLBACK_CONTINUE; + if (validator->status) + eo_event_callback_stop(event->object); } diff --git a/src/lib/elementary/elm_helper.h b/src/lib/elementary/elm_helper.h index 415faebd4b..71c264b61f 100644 --- a/src/lib/elementary/elm_helper.h +++ b/src/lib/elementary/elm_helper.h @@ -101,7 +101,7 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNUL * @see elm_validotor_regex_regex_set() * @since 1.14 */ -EAPI Eina_Bool +EAPI void elm_validator_regexp_helper(void *data, const Eo_Event *event); #endif diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c index 3e5133a2a2..ca8fe1ffc6 100644 --- a/src/lib/elementary/elm_interface_atspi_accessible.c +++ b/src/lib/elementary/elm_interface_atspi_accessible.c @@ -414,7 +414,7 @@ elm_atspi_relation_clone(const Elm_Atspi_Relation *relation) return ret; } -static Eina_Bool +static void _on_rel_obj_del(void *data, const Eo_Event *event) { Elm_Atspi_Relation_Set *set = data; @@ -435,7 +435,6 @@ _on_rel_obj_del(void *data, const Eo_Event *event) free(rel); } } - return EINA_TRUE; } EAPI Eina_Bool diff --git a/src/lib/elementary/elm_interface_atspi_image.c b/src/lib/elementary/elm_interface_atspi_image.c index 255ec4fb26..7224737fbd 100644 --- a/src/lib/elementary/elm_interface_atspi_image.c +++ b/src/lib/elementary/elm_interface_atspi_image.c @@ -8,12 +8,10 @@ #include "elm_widget.h" #include "elm_priv.h" -static Eina_Bool +static void _free_desc_cb(void *data, const Eo_Event *event EINA_UNUSED) { eina_stringshare_del(data); - - return EINA_TRUE; } EOLIAN static const char* diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index 7f13988186..5c1e166cce 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -59,13 +59,13 @@ _elm_scroll_wanted_coordinates_update(Elm_Scrollable_Smart_Interface_Data *sid, Evas_Coord x, Evas_Coord y); -static Eina_Bool _elm_scroll_hold_animator(void *data, const Eo_Event *event); -static Eina_Bool _elm_scroll_on_hold_animator(void *data, const Eo_Event *event); -static Eina_Bool _elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event); -static Eina_Bool _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event); -static Eina_Bool _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event); -static Eina_Bool _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event); -static Eina_Bool _elm_scroll_momentum_animator(void *data, const Eo_Event *event); +static void _elm_scroll_hold_animator(void *data, const Eo_Event *event); +static void _elm_scroll_on_hold_animator(void *data, const Eo_Event *event); +static void _elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event); +static void _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event); +static void _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event); +static void _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event); +static void _elm_scroll_momentum_animator(void *data, const Eo_Event *event); static double _round(double value, int pos) @@ -1301,10 +1301,10 @@ _elm_scroll_momentum_end(Elm_Scrollable_Smart_Interface_Data *sid) } } -static Eina_Bool +static void _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED) { - ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(data, sid, EINA_FALSE); + ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(data, sid); Evas_Coord x, y, dx, w, odx, ed, md; double t, p, dt, pd, r; @@ -1353,13 +1353,12 @@ _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED) ELM_ANIMATOR_CONNECT(sid->obj, sid->down.bounce_x_animator, _elm_scroll_bounce_x_animator, sid->obj); } } - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event EINA_UNUSED) { - ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(data, sid, EINA_FALSE); + ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(data, sid); Evas_Coord x, y, dy, h, ody, ed, md; double t, p, dt, pd, r; @@ -1408,8 +1407,6 @@ _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event EINA_UNUSED) ELM_ANIMATOR_DISCONNECT(sid->obj, sid->down.bounce_y_animator, _elm_scroll_bounce_y_animator, sid->obj); } } - - return EO_CALLBACK_CONTINUE; } static void @@ -2085,7 +2082,7 @@ _paging_is_enabled(Elm_Scrollable_Smart_Interface_Data *sid) return EINA_TRUE; } -static Eina_Bool +static void _elm_scroll_momentum_animator(void *data, const Eo_Event *event EINA_UNUSED) { double t, at, dt, p, r; @@ -2096,7 +2093,7 @@ _elm_scroll_momentum_animator(void *data, const Eo_Event *event EINA_UNUSED) if (!sid->pan_obj) { ELM_ANIMATOR_DISCONNECT(sid->obj, sid->down.momentum_animator, _elm_scroll_momentum_animator, sid); - return EO_CALLBACK_CONTINUE; + return; } t = ecore_loop_time_get(); @@ -2166,8 +2163,6 @@ _elm_scroll_momentum_animator(void *data, const Eo_Event *event EINA_UNUSED) _elm_scroll_wanted_region_set(sid->obj); } } - - return EO_CALLBACK_CONTINUE; } static Evas_Coord @@ -2264,7 +2259,7 @@ _elm_scroll_page_y_get(Elm_Scrollable_Smart_Interface_Data *sid, return y; } -static Eina_Bool +static void _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event EINA_UNUSED) { Elm_Scrollable_Smart_Interface_Data *sid = data; @@ -2295,14 +2290,13 @@ _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event EINA_UNUSED) } elm_interface_scrollable_content_pos_set(sid->obj, px, py, EINA_TRUE); _elm_scroll_wanted_coordinates_update(sid, px, py); - return EO_CALLBACK_CONTINUE; + return; on_end: ELM_ANIMATOR_DISCONNECT(sid->obj, sid->scrollto.x.animator, _elm_scroll_scroll_to_x_animator, sid); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event EINA_UNUSED) { Elm_Scrollable_Smart_Interface_Data *sid = data; @@ -2334,11 +2328,10 @@ _elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event EINA_UNUSED) elm_interface_scrollable_content_pos_set(sid->obj, px, py, EINA_TRUE); _elm_scroll_wanted_coordinates_update(sid, px, py); - return EO_CALLBACK_CONTINUE; + return; on_end: ELM_ANIMATOR_DISCONNECT(sid->obj, sid->scrollto.y.animator, _elm_scroll_scroll_to_y_animator, sid); - return EO_CALLBACK_CONTINUE; } static void @@ -3097,7 +3090,7 @@ _elm_scroll_hold_enterer(void *data) return EINA_FALSE; } -static Eina_Bool +static void _elm_scroll_hold_animator(void *data, const Eo_Event *event EINA_UNUSED) { Elm_Scrollable_Smart_Interface_Data *sid = data; @@ -3105,10 +3098,9 @@ _elm_scroll_hold_animator(void *data, const Eo_Event *event EINA_UNUSED) ecore_idle_enterer_del(sid->down.hold_enterer); sid->down.hold_enterer = ecore_idle_enterer_before_add(_elm_scroll_hold_enterer, sid); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _elm_scroll_on_hold_animator(void *data, const Eo_Event *event EINA_UNUSED) { double t, td; @@ -3154,8 +3146,6 @@ _elm_scroll_on_hold_animator(void *data, const Eo_Event *event EINA_UNUSED) elm_interface_scrollable_content_pos_set(sid->obj, x, y, EINA_TRUE); } sid->down.onhold_tlast = t; - - return EO_CALLBACK_CONTINUE; } static void @@ -3815,13 +3805,13 @@ _elm_scroll_pan_resized_cb(void *data, } /* even external pan objects get this */ -static Eina_Bool +static void _elm_scroll_pan_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) { Evas_Coord w = 0, h = 0; Elm_Scrollable_Smart_Interface_Data *sid = data; - if (!sid->pan_obj) return EINA_TRUE; + if (!sid->pan_obj) return; elm_obj_pan_content_size_get(sid->pan_obj, &w, &h); if ((w != sid->content_info.w) || (h != sid->content_info.h)) @@ -3835,8 +3825,6 @@ _elm_scroll_pan_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) sid->content_info.resized = EINA_TRUE; _elm_scroll_wanted_region_set(sid->obj); } - - return EINA_TRUE; } static void diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 6e75709c4b..3888d6c058 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -1145,7 +1145,7 @@ _zoom_do(Elm_Map_Data *sd, evas_object_smart_changed(sd->pan_obj); } -static Eina_Bool +static void _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) { ELM_MAP_DATA_GET(data, sd); @@ -1162,10 +1162,9 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) sd->ani.zoom_cnt--; _zoom_do(sd, sd->ani.zoom); } - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _zoom_bring_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) { ELM_MAP_DATA_GET(data, sd); @@ -1199,8 +1198,6 @@ _zoom_bring_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) sd->ani.region_cnt--; } } - - return EO_CALLBACK_CONTINUE; } static Eina_Bool diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index 662a54d85e..358d1634db 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -423,15 +423,13 @@ _menu_hide(void *data, } } -static Eina_Bool +static void _hover_dismissed_cb(void *data, const Eo_Event *event) { _menu_hide(data, event->object, event->info); eo_event_callback_call (data, EFL_UI_EVENT_CLICKED, NULL); eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL); - - return EINA_TRUE; } static void @@ -520,7 +518,7 @@ _menu_item_inactivate_cb(void *data, elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE); } -static Eina_Bool +static void _block_menu(void *_sd, const Eo_Event *event EINA_UNUSED) { const Eina_List *l; @@ -534,11 +532,9 @@ _block_menu(void *_sd, const Eo_Event *event EINA_UNUSED) current->blocked = EINA_TRUE; elm_object_item_disabled_set(eo_current, EINA_TRUE); } - - return EINA_TRUE; } -static Eina_Bool +static void _unblock_menu(void *_sd, const Eo_Event *event EINA_UNUSED) { const Eina_List *l; @@ -551,8 +547,6 @@ _unblock_menu(void *_sd, const Eo_Event *event EINA_UNUSED) elm_object_item_disabled_set(eo_current, !current->was_enabled); current->blocked = EINA_FALSE; } - - return EINA_TRUE; } EOLIAN static void diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 85572f8853..5a057e3e67 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -1085,7 +1085,7 @@ _elm_panel_efl_canvas_group_group_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x // FIXME: This is definitively not an animator, but a pre calc function // Not sure if I can hook on smart calc or on RENDER_PRE, will be left for later -static Eina_Bool +static void _elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) { Evas_Object *obj = data; @@ -1097,7 +1097,7 @@ _elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) if (sd->hidden) _drawer_close(obj, w, h, EINA_FALSE); else _drawer_open(obj, w, h, EINA_FALSE); - return EO_CALLBACK_STOP; + eo_event_callback_stop(event->object); } EOLIAN static void diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index 317f405d85..0436a3dc37 100644 --- a/src/lib/elementary/elm_photo.c +++ b/src/lib/elementary/elm_photo.c @@ -234,12 +234,10 @@ _elm_photo_internal_image_follow(Evas_Object *obj) (img, EVAS_CALLBACK_RESIZE, _icon_move_resize_cb, obj); } -static Eina_Bool +static void _on_thumb_done(void *data, const Eo_Event *event EINA_UNUSED) { _elm_photo_internal_image_follow(data); - - return EINA_TRUE; } EOLIAN static void diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c index 9cfec5d38f..139c5111ef 100644 --- a/src/lib/elementary/elm_photocam.c +++ b/src/lib/elementary/elm_photocam.c @@ -765,7 +765,7 @@ _zoom_do(Evas_Object *obj, return EINA_TRUE; } -static Eina_Bool +static void _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) { double t; @@ -789,8 +789,6 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL); } - - return EO_CALLBACK_CONTINUE; } static Eina_Bool @@ -1034,7 +1032,7 @@ _elm_photocam_elm_widget_event(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED, Evas return EINA_TRUE; } -static Eina_Bool +static void _bounce_eval(void *data, const Eo_Event *event EINA_UNUSED) { Evas_Object *obj = data; @@ -1070,7 +1068,7 @@ _bounce_eval(void *data, const Eo_Event *event EINA_UNUSED) _zoom_do(obj, 1.0 - (1.0 - tt)); - return EO_CALLBACK_CONTINUE; + return; on_end: sd->g_layer_zoom.imx = 0; @@ -1080,7 +1078,6 @@ _bounce_eval(void *data, const Eo_Event *event EINA_UNUSED) elm_interface_scrollable_freeze_set(obj, EINA_FALSE); eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj); - return EO_CALLBACK_CONTINUE; } static void @@ -1954,7 +1951,9 @@ done: // FIXME: If one day we do support partial animator in photocam, this would require change Eo_Event event = {}; event.object = evas_object_evas_get(obj); - if (!_zoom_anim_cb(obj, &event)) + _zoom_anim_cb(obj, &event); + // FIXME: Unhandled. + if (0) { _elm_photocam_bounce_reset(obj, sd); an = 0; diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 80bb591d34..bb5c44990f 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -41,13 +41,13 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { static Eina_Bool _key_action_spin(Evas_Object *obj, const char *params); static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params); -static Eina_Bool +static void _inc_dec_button_clicked_cb(void *data, const Eo_Event *event); -static Eina_Bool +static void _inc_dec_button_pressed_cb(void *data, const Eo_Event *event); -static Eina_Bool +static void _inc_dec_button_unpressed_cb(void *data, const Eo_Event *event); -static Eina_Bool +static void _inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event); static const Elm_Action key_actions[] = { @@ -412,12 +412,10 @@ _entry_value_apply(Evas_Object *obj) _delay_change_timer_cb, obj); } -static Eina_Bool +static void _entry_activated_cb(void *data, const Eo_Event *event EINA_UNUSED) { _entry_value_apply(data); - - return EINA_TRUE; } static int @@ -832,7 +830,7 @@ _button_inc_dec_stop_cb(void *data, _spin_stop(data); } -static Eina_Bool +static void _inc_dec_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) { ELM_SPINNER_DATA_GET(data, sd); @@ -844,11 +842,9 @@ _inc_dec_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) if (sd->entry_visible) _entry_value_apply(data); if (_elm_config->access_mode) _access_increment_decrement_info_say(data, EINA_TRUE); - - return EINA_TRUE; } -static Eina_Bool +static void _inc_dec_button_pressed_cb(void *data, const Eo_Event *event) { ELM_SPINNER_DATA_GET(data, sd); @@ -862,11 +858,9 @@ _inc_dec_button_pressed_cb(void *data, const Eo_Event *event) _val_inc_dec_start, data); if (sd->entry_visible) _entry_value_apply(data); - - return EINA_TRUE; } -static Eina_Bool +static void _inc_dec_button_unpressed_cb(void *data, const Eo_Event *event EINA_UNUSED) { ELM_SPINNER_DATA_GET(data, sd); @@ -878,19 +872,15 @@ _inc_dec_button_unpressed_cb(void *data, const Eo_Event *event EINA_UNUSED) } _spin_stop(data); - - return EINA_TRUE; } -static Eina_Bool +static void _text_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) { _toggle_entry(data); - - return EINA_TRUE; } -static Eina_Bool +static void _inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event) { Efl_Event_Pointer *ev = event->info; @@ -901,8 +891,6 @@ _inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event) ecore_timer_del(sd->longpress_timer); sd->longpress_timer = NULL; } - - return EINA_TRUE; } EOLIAN static void diff --git a/src/lib/elementary/elm_store.c b/src/lib/elementary/elm_store.c index fd5b370da3..4735f911ac 100644 --- a/src/lib/elementary/elm_store.c +++ b/src/lib/elementary/elm_store.c @@ -223,32 +223,30 @@ _store_item_eval(void *data) } } -static Eina_Bool +static void _store_genlist_item_realized(void *data, const Eo_Event *event) { Elm_Store *st = data; Elm_Object_Item *gli = event->info; Elm_Store_Item *sti = elm_object_item_data_get(gli); - if (!sti) return EINA_TRUE; + if (!sti) return; st->realized_count++; sti->live = EINA_TRUE; ecore_job_del(sti->eval_job); sti->eval_job = ecore_job_add(_store_item_eval, sti); - return EINA_TRUE; } -static Eina_Bool +static void _store_genlist_item_unrealized(void *data, const Eo_Event *event) { Elm_Store *st = data; Elm_Object_Item *gli = event->info; Elm_Store_Item *sti = elm_object_item_data_get(gli); - if (!sti) return EINA_TRUE; + if (!sti) return; st->realized_count--; sti->live = EINA_FALSE; ecore_job_del(sti->eval_job); sti->eval_job = ecore_job_add(_store_item_eval, sti); - return EINA_TRUE; } static const Elm_Store_Item_Mapping * diff --git a/src/lib/elementary/elm_video.c b/src/lib/elementary/elm_video.c index 3292b904c5..41ea4ce820 100644 --- a/src/lib/elementary/elm_video.c +++ b/src/lib/elementary/elm_video.c @@ -28,17 +28,17 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { }; -static Eina_Bool +static void _on_open_done(void *data, const Eo_Event *event); -static Eina_Bool +static void _on_playback_started(void *data, const Eo_Event *event); -static Eina_Bool +static void _on_playback_finished(void *data, const Eo_Event *event); -static Eina_Bool +static void _on_aspect_ratio_updated(void *data, const Eo_Event *event); -static Eina_Bool +static void _on_title_changed(void *data, const Eo_Event *event); -static Eina_Bool +static void _on_audio_level_changed(void *data, const Eo_Event *event); static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); @@ -158,42 +158,36 @@ _on_size_hints_changed(void *data EINA_UNUSED, elm_layout_sizing_eval(obj); } -static Eina_Bool +static void _on_open_done(void *data, const Eo_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,video,open", "elm"); - - return EINA_TRUE; } -static Eina_Bool +static void _on_playback_started(void *data, const Eo_Event *event EINA_UNUSED) { elm_layout_signal_emit(data, "elm,video,play", "elm"); - return EINA_TRUE; + return; } -static Eina_Bool +static void _on_playback_finished(void *data, const Eo_Event *event EINA_UNUSED) { ELM_VIDEO_DATA_GET(data, sd); emotion_object_play_set(sd->emotion, EINA_FALSE); elm_layout_signal_emit(data, "elm,video,end", "elm"); - - return EINA_TRUE; } -static Eina_Bool +static void _on_aspect_ratio_updated(void *data, const Eo_Event *event EINA_UNUSED) { elm_layout_sizing_eval(data); - - return EINA_TRUE; } -static Eina_Bool +static void _on_title_changed(void *data, const Eo_Event *event EINA_UNUSED) { const char *title; @@ -203,16 +197,12 @@ _on_title_changed(void *data, const Eo_Event *event EINA_UNUSED) title = emotion_object_title_get(sd->emotion); elm_layout_text_set(data, "elm,title", title); elm_layout_signal_emit(data, "elm,video,title", "elm"); - - return EINA_TRUE; } -static Eina_Bool +static void _on_audio_level_changed(void *data, const Eo_Event *event EINA_UNUSED) { (void)data; - - return EINA_TRUE; } static Eina_Bool diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c index 9baa553879..871f5e385b 100644 --- a/src/lib/elementary/elm_view_form.c +++ b/src/lib/elementary/elm_view_form.c @@ -91,7 +91,7 @@ _efl_model_promise_error_cb(void* data, Eina_Error error EINA_UNUSED) free(p); } -static Eina_Bool +static void _efl_model_properties_change_cb(void *data, const Eo_Event *event) { const Efl_Model_Property_Event *evt = event->info; @@ -102,11 +102,11 @@ _efl_model_properties_change_cb(void *data, const Eo_Event *event) Elm_View_Form_Promise *p = NULL; Eina_Array_Iterator it; - EINA_SAFETY_ON_NULL_RETURN_VAL(priv, EINA_TRUE); - EINA_SAFETY_ON_NULL_RETURN_VAL(evt, EINA_TRUE); + EINA_SAFETY_ON_NULL_RETURN(priv); + EINA_SAFETY_ON_NULL_RETURN(evt); if (!evt->changed_properties) - return EINA_TRUE; + return; //update all widgets with this property EINA_ARRAY_ITER_NEXT(evt->changed_properties, i, prop, it) @@ -118,8 +118,6 @@ _efl_model_properties_change_cb(void *data, const Eo_Event *event) eina_promise_then(promise, &_efl_model_promise_then_cb, &_efl_model_promise_error_cb, p); } - - return EINA_TRUE; } static void diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c index 56fc27c490..1f7ee28727 100644 --- a/src/lib/elementary/elm_view_list.c +++ b/src/lib/elementary/elm_view_list.c @@ -48,12 +48,12 @@ struct _View_List_ValueItem }; static void _efl_model_load_children(View_List_ItemData *); -static Eina_Bool _efl_model_children_count_change_cb(void *, const Eo_Event *event); -static Eina_Bool _efl_model_properties_change_cb(void *, const Eo_Event *event); +static void _efl_model_children_count_change_cb(void *, const Eo_Event *event); +static void _efl_model_properties_change_cb(void *, const Eo_Event *event); -static Eina_Bool _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event); -static Eina_Bool _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event); -static Eina_Bool _contracted_cb(void *data EINA_UNUSED, const Eo_Event *event); +static void _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event); +static void _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event); +static void _contracted_cb(void *data EINA_UNUSED, const Eo_Event *event); /* --- Genlist Callbacks --- */ EO_CALLBACKS_ARRAY_DEFINE(model_callbacks, @@ -241,22 +241,20 @@ _item_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part) return text; } -static Eina_Bool +static void _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event) { Elm_Object_Item *item = event->info; View_List_ItemData *idata = elm_object_item_data_get(item); - EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_TRUE); + EINA_SAFETY_ON_NULL_RETURN(idata); eo_event_callback_array_add(idata->model, model_callbacks(), idata); _efl_model_load_children(idata); - - return EINA_TRUE; } -static Eina_Bool +static void _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event) { Elm_Object_Item *item = event->info; @@ -264,15 +262,13 @@ _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event) eo_event_callback_array_del(idata->model, model_callbacks(), idata); elm_genlist_item_expanded_set(item, EINA_FALSE); - return EINA_TRUE; } -static Eina_Bool +static void _contracted_cb(void *data EINA_UNUSED, const Eo_Event *event) { Elm_Object_Item *glit = event->info; elm_genlist_item_subitems_clear(glit); - return EINA_TRUE; } static void @@ -289,19 +285,17 @@ _genlist_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_ } /* --- Efl_Model Callbacks --- */ -static Eina_Bool +static void _efl_model_properties_change_cb(void *data, const Eo_Event *event) { View_List_ItemData *idata = data; Efl_Model_Property_Event *evt = event->info; - EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_TRUE); - EINA_SAFETY_ON_NULL_RETURN_VAL(evt, EINA_TRUE); + EINA_SAFETY_ON_NULL_RETURN(idata); + EINA_SAFETY_ON_NULL_RETURN(evt); if (idata->item) elm_genlist_item_update(idata->item); - - return EINA_TRUE; } static void @@ -343,19 +337,17 @@ _efl_model_load_children(View_List_ItemData *pdata) eina_promise_then(promise, &_efl_model_load_children_then, NULL, pdata); } -static Eina_Bool +static void _efl_model_children_count_change_cb(void *data, const Eo_Event *event EINA_UNUSED) { View_List_ItemData *idata = data; - EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_FALSE); - EINA_SAFETY_ON_NULL_RETURN_VAL(idata->priv, EINA_FALSE); - EINA_SAFETY_ON_NULL_RETURN_VAL(idata->priv->genlist, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN(idata); + EINA_SAFETY_ON_NULL_RETURN(idata->priv); + EINA_SAFETY_ON_NULL_RETURN(idata->priv->genlist); elm_genlist_item_subitems_clear(idata->item); _efl_model_load_children(idata); - - return EINA_TRUE; } static void diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index 4155698d53..34e78feda2 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -97,11 +97,11 @@ _elm_scrollable_is(const Evas_Object *obj) eo_isa(obj, ELM_INTERFACE_SCROLLABLE_MIXIN); } -static Eina_Bool +static void _on_sub_obj_del(void *data, const Eo_Event *event); -static Eina_Bool +static void _on_sub_obj_hide(void *data, const Eo_Event *event); -static Eina_Bool +static void _propagate_event(void *data, const Eo_Event *event); EO_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks, @@ -244,14 +244,13 @@ _parents_unfocus(Evas_Object *obj) } } -static Eina_Bool +static void _on_sub_obj_hide(void *data EINA_UNUSED, const Eo_Event *event) { elm_widget_focus_hide_handle(event->object); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _on_sub_obj_del(void *data, const Eo_Event *event) { ELM_WIDGET_DATA_GET(data, sd); @@ -274,8 +273,6 @@ _on_sub_obj_del(void *data, const Eo_Event *event) if (!elm_widget_sub_object_del(sd->obj, event->object)) ERR("failed to remove sub object %p from %p\n", event->object, sd->obj); } - - return EO_CALLBACK_CONTINUE; } static const Evas_Smart_Cb_Description _smart_callbacks[] = @@ -708,11 +705,11 @@ _propagate_y_drag_lock(Evas_Object *obj, } } -static Eina_Bool +static void _propagate_event(void *data EINA_UNUSED, const Eo_Event *event) { Eo *obj = event->object; - INTERNAL_ENTRY EO_CALLBACK_CONTINUE; + INTERNAL_ENTRY; Evas_Callback_Type type; Evas_Event_Flags *event_flags; union { @@ -726,7 +723,7 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event) if (event->desc == EFL_EVENT_KEY_DOWN) { Efl_Event_Key_Data *ev = eo_data_scope_get(event->info, EFL_EVENT_KEY_CLASS); - if (!ev) return EO_CALLBACK_CONTINUE; + if (!ev) return; event_info.down.timestamp = ev->timestamp; event_info.down.keyname = (char*) ev->keyname; event_info.down.key = ev->key; @@ -744,7 +741,7 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event) else if (event->desc == EFL_EVENT_KEY_UP) { Efl_Event_Key_Data *ev = eo_data_scope_get(event->info, EFL_EVENT_KEY_CLASS); - if (!ev) return EO_CALLBACK_CONTINUE; + if (!ev) return; event_info.up.timestamp = ev->timestamp; event_info.up.keyname = (char*) ev->keyname; event_info.up.key = ev->key; @@ -762,7 +759,7 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event) else if (event->desc == EFL_EVENT_POINTER_WHEEL) { Efl_Event_Pointer_Data *ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); - if (!ev) return EO_CALLBACK_CONTINUE; + if (!ev) return; event_info.move.buttons = ev->pressed_buttons; event_info.move.cur.canvas.x = ev->cur.x; event_info.move.cur.canvas.y = ev->cur.y; @@ -779,11 +776,9 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event) event_flags = &event_info.move.event_flags; } else - return EO_CALLBACK_CONTINUE; + return; elm_widget_event_propagate(obj, type, &event_info, event_flags); - - return EO_CALLBACK_CONTINUE; } /** @@ -4417,15 +4412,14 @@ _track_obj_update(Evas_Object *track, Evas_Object *obj) else evas_object_hide(track); } -static Eina_Bool +static void _track_obj_view_update(void *data, const Eo_Event *event) { Elm_Widget_Item_Data *item = data; _track_obj_update(item->track_obj, event->object); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _track_obj_view_del(void *data, const Eo_Event *event); EO_CALLBACKS_ARRAY_DEFINE(tracker_callbacks, @@ -4435,7 +4429,7 @@ EO_CALLBACKS_ARRAY_DEFINE(tracker_callbacks, { EFL_GFX_EVENT_HIDE, _track_obj_view_update }, { EVAS_OBJECT_EVENT_DEL, _track_obj_view_del }); -static Eina_Bool +static void _track_obj_view_del(void *data, const Eo_Event *event EINA_UNUSED) { Elm_Widget_Item_Data *item = data; @@ -4447,8 +4441,6 @@ _track_obj_view_del(void *data, const Eo_Event *event EINA_UNUSED) _track_obj_del); evas_object_del(item->track_obj); item->track_obj = NULL; - - return EO_CALLBACK_CONTINUE; } static void @@ -4498,14 +4490,13 @@ _elm_widget_item_signal_callback_list_get(Elm_Widget_Item_Data *item, Eina_List #define ERR_NOT_SUPPORTED(item, method) ERR("%s does not support %s API.", elm_widget_type_get(item->widget), method); -static Eina_Bool +static void _eo_del_cb(void *data EINA_UNUSED, const Eo_Event *event) { Elm_Widget_Item_Data *item = eo_data_scope_get(event->object, ELM_WIDGET_ITEM_CLASS); - ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_TRUE); + ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); if (item->del_func) item->del_func((void *) WIDGET_ITEM_DATA_GET(event->object), item->widget, item->eo_obj); - return EINA_TRUE; } /** diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index e69842e5f8..0ee1847747 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -84,21 +84,19 @@ typedef struct Evas_Callback_Type type; } _eo_evas_cb_info; -static Eina_Bool +static void _eo_evas_object_cb(void *data, const Eo_Event *event) { _eo_evas_object_cb_info *info = data; Evas *evas = evas_object_evas_get(event->object); if (info->func) info->func(info->data, evas, event->object, event->info); - return EINA_TRUE; } -static Eina_Bool +static void _eo_evas_cb(void *data, const Eo_Event *event) { _eo_evas_cb_info *info = data; if (info->func) info->func(info->data, event->object, event->info); - return EINA_TRUE; } void diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c index 5d786c2c7b..d454885002 100644 --- a/src/lib/evas/canvas/evas_canvas3d_node.c +++ b/src/lib/evas/canvas/evas_canvas3d_node.c @@ -50,7 +50,7 @@ _generate_unic_color_key(Evas_Color *color, Evas_Color *bg_color, Evas_Canvas3D_ return eina_stringshare_printf("%p %p", node, mesh); } -static Eina_Bool +static void _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event) { Eina_List *collision_list = NULL, *l = NULL; @@ -72,18 +72,24 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event if (box_intersection_box(&pd_target->aabb, &pd->aabb)) ret = eo_event_callback_call(target_node, eo_desc, n); } - return ret; + if (!ret) + { + /* XXX: Putting it like this because that's how the logic was, + * but it seems absolutely wrong that it only checks the last + * and decides based on that. */ + eo_event_callback_stop(event->object); + } } - return ret; } -static Eina_Bool +static void _evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Eo_Event *event) { Eina_Bool ret = EINA_FALSE; const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get("clicked"); ret = eo_event_callback_call((Eo *)event->info, eo_desc, event->info); - return ret; + if (!ret) + eo_event_callback_stop(event->object); } static inline Evas_Canvas3D_Node_Mesh * diff --git a/src/lib/evas/canvas/evas_canvas3d_node_callback.h b/src/lib/evas/canvas/evas_canvas3d_node_callback.h index 0f02ae4a66..e868da5e0f 100644 --- a/src/lib/evas/canvas/evas_canvas3d_node_callback.h +++ b/src/lib/evas/canvas/evas_canvas3d_node_callback.h @@ -23,9 +23,9 @@ const Eo_Event_Description evas_canvas3d_node_private_event_desc[] = }; /*Private callbacks */ -static Eina_Bool +static void _evas_canvas3d_node_private_callback_clicked(void *data, const Eo_Event *event); -static Eina_Bool +static void _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event); Eo_Event_Cb evas_canvas3d_node_private_callback_functions[] = diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c index 8348e2ae38..dd98ede361 100644 --- a/src/lib/evas/canvas/evas_clip.c +++ b/src/lib/evas/canvas/evas_clip.c @@ -213,7 +213,7 @@ _evas_object_clip_mask_unset(Evas_Object_Protected_Data *obj) extern const char *o_rect_type; extern const char *o_image_type; -static Eina_Bool _clipper_del_cb(void *data, const Eo_Event *event); +static void _clipper_del_cb(void *data, const Eo_Event *event); EOLIAN void _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip) @@ -477,13 +477,13 @@ _evas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj) evas_object_clip_across_check(eo_obj, obj); } -static Eina_Bool +static void _clipper_del_cb(void *data, const Eo_Event *event) { Evas_Object *eo_obj = data; Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); - if (!obj) return EO_CALLBACK_CONTINUE; + if (!obj) return; _evas_object_clip_unset(eo_obj, obj); if (obj->prev->clipper && (obj->prev->clipper->object == event->object)) @@ -493,8 +493,6 @@ _clipper_del_cb(void *data, const Eo_Event *event) state_write->clipper = NULL; EINA_COW_STATE_WRITE_END(obj, state_write, prev); } - - return EO_CALLBACK_CONTINUE; } void diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c index a2dfafee59..0eb5511fa2 100644 --- a/src/lib/evas/canvas/evas_device.c +++ b/src/lib/evas/canvas/evas_device.c @@ -24,15 +24,13 @@ * here (callbacks and canvas private data). */ -static Eina_Bool +static void _del_cb(void *data, const Eo_Event *ev) { Evas_Public_Data *e = data; // can not be done in std destructor e->devices = eina_list_remove(e->devices, ev->object); - - return EO_CALLBACK_CONTINUE; } EAPI Evas_Device * diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index c55006d63e..f0d8a951fe 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -3238,7 +3238,7 @@ _evas_canvas_event_down_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) return e->pointer.downs; } -static Eina_Bool +static void _evas_canvas_event_pointer_cb(void *data, const Eo_Event *event) { Efl_Event_Pointer_Data *ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); @@ -3246,7 +3246,7 @@ _evas_canvas_event_pointer_cb(void *data, const Eo_Event *event) Evas *eo_e = event->object; int dir; - if (!ev) return EO_CALLBACK_CONTINUE; + if (!ev) return; ev->evas_done = EINA_TRUE; ev->modifiers = &e->modifiers; @@ -3322,11 +3322,9 @@ _evas_canvas_event_pointer_cb(void *data, const Eo_Event *event) ev->evas_done = EINA_FALSE; break; } - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _evas_canvas_event_key_cb(void *data, const Eo_Event *event) { Efl_Event_Key *evt = event->info; @@ -3334,7 +3332,7 @@ _evas_canvas_event_key_cb(void *data, const Eo_Event *event) Efl_Event_Key_Data *ev; ev = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS); - if (!ev) return EO_CALLBACK_CONTINUE; + if (!ev) return; if (ev->pressed) { @@ -3352,7 +3350,6 @@ _evas_canvas_event_key_cb(void *data, const Eo_Event *event) } ev->evas_done = EINA_TRUE; - return EO_CALLBACK_CONTINUE; } EO_CALLBACKS_ARRAY_DEFINE(_evas_canvas_event_pointer_callbacks, diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c index 0ffc324ea4..ee78921910 100644 --- a/src/lib/evas/canvas/evas_filter_mixin.c +++ b/src/lib/evas/canvas/evas_filter_mixin.c @@ -72,7 +72,7 @@ _filter_end_sync(Evas_Filter_Context *ctx, Evas_Object_Protected_Data *obj, evas_filter_context_destroy(ctx); } -static Eina_Bool +static void _render_post_cb(void *data, const Eo_Event *event EINA_UNUSED) { Eo *eo_obj = data; @@ -91,8 +91,6 @@ _render_post_cb(void *data, const Eo_Event *event EINA_UNUSED) _filter_end_sync(task->ctx, obj, pd, task->success); free(task); } - - return EO_CALLBACK_CONTINUE; } static void diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index 7a3a3e58fe..3884284be5 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -109,17 +109,15 @@ _evas_object_box_accessor_free(Evas_Object_Box_Accessor *it) free(it); } -static Eina_Bool +static void _on_child_resize(void *data, const Eo_Event *event EINA_UNUSED) { Evas_Object *box = data; - EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(box, priv, EO_CALLBACK_CONTINUE); + EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv); if (!priv->layouting) evas_object_smart_changed(box); - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _on_child_del(void *data, const Eo_Event *event) { Evas_Object *box = data; @@ -129,21 +127,17 @@ _on_child_del(void *data, const Eo_Event *event) if (!ret) ERR("child removal failed"); evas_object_smart_changed(box); - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _on_child_hints_changed(void *data, const Eo_Event *event EINA_UNUSED) { Evas_Object *box = data; - EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(box, priv, EO_CALLBACK_CONTINUE); + EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv); // XXX: this breaks box repacking in elementary. widgets DEPEND on being able // to change their hints evenr WHILE being laid out. so comment this out. // if (!priv->layouting) evas_object_smart_changed(box); - - return EO_CALLBACK_CONTINUE; } static void diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index cf55600fd5..fa2a1a8ba4 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -86,18 +86,16 @@ _init_cow(void) return EINA_TRUE; } -static Eina_Bool +static void _animator_repeater(void *data, const Eo_Event *event) { Evas_Object_Protected_Data *obj = data; eo_event_callback_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info); DBG("Emitting animator tick on %p.", obj->object); - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _check_event_catcher_add(void *data, const Eo_Event *event) { const Eo_Callback_Array_Item *array = event->info; @@ -119,11 +117,9 @@ _check_event_catcher_add(void *data, const Eo_Event *event) obj->move_ref++; } } - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _check_event_catcher_del(void *data, const Eo_Event *event) { const Eo_Callback_Array_Item *array = event->info; @@ -145,8 +141,6 @@ _check_event_catcher_del(void *data, const Eo_Event *event) obj->move_ref--; } } - - return EO_CALLBACK_CONTINUE; } EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch, diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index 6edcf10794..8462adcc8c 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -63,12 +63,11 @@ struct _Evas_Object_Smart_Iterator Evas_Object *parent; }; -static Eina_Bool +static void _eo_evas_smart_cb(void *data, const Eo_Event *event) { _eo_evas_smart_cb_info *info = data; if (info->func) info->func(info->data, event->object, event->info); - return EINA_TRUE; } /* private methods for smart objects */ diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index c5fe22a354..cad89cc3f7 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -243,24 +243,20 @@ _evas_object_table_option_del(Evas_Object *o) return evas_object_data_del(o, EVAS_OBJECT_TABLE_OPTION_KEY); } -static Eina_Bool +static void _on_child_del(void *data, const Eo_Event *event) { Evas_Object *table = data; evas_object_table_unpack(table, event->object); - - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _on_child_hints_changed(void *data, const Eo_Event *event EINA_UNUSED) { Evas_Object *table = data; - EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(table, priv, EO_CALLBACK_CONTINUE); + EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(table, priv); _evas_object_table_cache_invalidate(priv); evas_object_smart_changed(table); - - return EO_CALLBACK_CONTINUE; } EO_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks, diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index c27b0d86f4..dbd032b4a9 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -7583,7 +7583,7 @@ _obstacle_find(Efl_Canvas_Text_Data *obj, Eo *eo_obs) return NULL; } -Eina_Bool +void _obstacle_del_cb(void *data, const Eo_Event *event) { Eo *eo_obj = data; @@ -7600,8 +7600,6 @@ _obstacle_del_cb(void *data, const Eo_Event *event) free(obs); _evas_textblock_changed(obj, data); obj->obstacle_changed = EINA_TRUE; - - return EINA_TRUE; } static void diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c index 0290a188ca..bc7034f447 100644 --- a/src/lib/evas/canvas/evas_object_vg.c +++ b/src/lib/evas/canvas/evas_object_vg.c @@ -80,7 +80,7 @@ _evas_vg_root_node_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd) return pd->root; } -static Eina_Bool +static void _cleanup_reference(void *data, const Eo_Event *event EINA_UNUSED) { Evas_VG_Data *pd = data; @@ -89,8 +89,6 @@ _cleanup_reference(void *data, const Eo_Event *event EINA_UNUSED) /* unref all renderer and may also destroy them async */ while ((renderer = eina_array_pop(&pd->cleanup))) eo_unref(renderer); - - return EO_CALLBACK_CONTINUE; } void diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c index 82e2c7b114..d2159a173f 100644 --- a/src/lib/evas/canvas/evas_vg_node.c +++ b/src/lib/evas/canvas/evas_vg_node.c @@ -17,7 +17,7 @@ static const Efl_VG_Interpolation interpolation_identity = { { 0, 0, 0 } }; -static Eina_Bool +static void _efl_vg_property_changed(void *data, const Eo_Event *event) { Efl_VG_Data *pd = data; @@ -27,7 +27,6 @@ _efl_vg_property_changed(void *data, const Eo_Event *event) parent = eo_parent_get(event->object); eo_event_callback_call(parent, event->desc, event->info); - return EINA_TRUE; } static void diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c index 4e163b79eb..64aecab8b4 100644 --- a/src/lib/evas/canvas/evas_vg_root_node.c +++ b/src/lib/evas/canvas/evas_vg_root_node.c @@ -32,17 +32,16 @@ _evas_vg_root_node_render_pre(Eo *obj EINA_UNUSED, _evas_vg_render_pre(child, s, current); } -static Eina_Bool +static void _evas_vg_root_node_changed(void *data, const Eo_Event *event) { Efl_VG_Root_Node_Data *pd = data; Efl_VG_Data *bd = eo_data_scope_get(event->object, EFL_VG_CLASS); - if (bd->changed) return EINA_TRUE; + if (bd->changed) return; bd->changed = EINA_TRUE; if (pd->parent) evas_object_change(pd->parent, pd->data); - return EINA_TRUE; } static void diff --git a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c index ae57d27696..e526f10425 100644 --- a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c +++ b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c @@ -33,15 +33,13 @@ _diskselector_item_free_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event free(data); } -static Eina_Bool +static void _ctxpopup_dismissed_cb(void *data, const Eo_Event *event) { Ctxpopup_Module_Data *ctx_mod; ctx_mod = (Ctxpopup_Module_Data *)data; evas_object_del(event->object); ctx_mod->ctxpopup = NULL; - - return EINA_TRUE; } static void @@ -86,7 +84,7 @@ _field_value_get(struct tm *tim, Elm_Datetime_Field_Type field_type) return (*timearr[field_type]); } -static Eina_Bool +static void _diskselector_cb(void *data EINA_UNUSED, const Eo_Event *event) { DiskItem_Data *disk_data; @@ -94,7 +92,11 @@ _diskselector_cb(void *data EINA_UNUSED, const Eo_Event *event) const char *fmt; disk_data = (DiskItem_Data *)elm_object_item_data_get(event->info); - if (!disk_data || !(disk_data->ctx_mod)) return EINA_FALSE; + if (!disk_data || !(disk_data->ctx_mod)) + { + eo_event_callback_stop(event->object); + return; + } elm_datetime_value_get(disk_data->ctx_mod->mod_data.base, &curr_time); fmt = disk_data->ctx_mod->mod_data.field_format_get(disk_data->ctx_mod->mod_data.base, disk_data->sel_field_type); @@ -104,27 +106,28 @@ _diskselector_cb(void *data EINA_UNUSED, const Eo_Event *event) _field_value_set(&curr_time, disk_data->sel_field_type, disk_data->sel_field_value); elm_datetime_value_set(disk_data->ctx_mod->mod_data.base, &curr_time); evas_object_hide(disk_data->ctx_mod->ctxpopup); - - return EINA_TRUE; } -static Eina_Bool +static void _ampm_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) { Ctxpopup_Module_Data *ctx_mod; struct tm curr_time; ctx_mod = (Ctxpopup_Module_Data *)data; - if (!ctx_mod) return EINA_FALSE; + if (!ctx_mod) + { + eo_event_callback_stop(event->object); + return; + } elm_datetime_value_get(ctx_mod->mod_data.base, &curr_time); if (curr_time.tm_hour >= 12) curr_time.tm_hour -= 12; else curr_time.tm_hour += 12; elm_datetime_value_set(ctx_mod->mod_data.base, &curr_time); - return EINA_TRUE; } -static Eina_Bool +static void _field_clicked_cb(void *data, const Eo_Event *event) { Ctxpopup_Module_Data *ctx_mod; @@ -141,7 +144,11 @@ _field_clicked_cb(void *data, const Eo_Event *event) Evas_Coord x = 0, y = 0, w = 0, h = 0, width; ctx_mod = (Ctxpopup_Module_Data *)data; - if (!ctx_mod) return EINA_FALSE; + if (!ctx_mod) + { + eo_event_callback_stop(event->object); + return; + } snprintf(buf, sizeof(buf), "datetime/%s", elm_object_style_get(event->object)); @@ -226,7 +233,6 @@ _field_clicked_cb(void *data, const Eo_Event *event) evas_object_move(ctx_mod->ctxpopup, (x + w / 2), y); } evas_object_show(ctx_mod->ctxpopup); - return EINA_TRUE; } static void diff --git a/src/modules/elementary/prefs/elm_button.c b/src/modules/elementary/prefs/elm_button.c index 4c6af6a562..dd304ada47 100644 --- a/src/modules/elementary/prefs/elm_button.c +++ b/src/modules/elementary/prefs/elm_button.c @@ -8,13 +8,12 @@ static Elm_Prefs_Item_Type supported_types[] = ELM_PREFS_TYPE_UNKNOWN }; -static Eina_Bool +static void _item_changed_cb(void *data, const Eo_Event *event) { Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; prefs_it_changed_cb(event->object); - return EINA_TRUE; } static Evas_Object * diff --git a/src/modules/elementary/prefs/elm_check.c b/src/modules/elementary/prefs/elm_check.c index 7d1b2cbf66..7614d2234c 100644 --- a/src/modules/elementary/prefs/elm_check.c +++ b/src/modules/elementary/prefs/elm_check.c @@ -6,13 +6,12 @@ static Elm_Prefs_Item_Type supported_types[] = ELM_PREFS_TYPE_UNKNOWN }; -static Eina_Bool +static void _item_changed_cb(void *data, const Eo_Event *event) { Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; prefs_it_changed_cb(event->object); - return EINA_TRUE; } static Evas_Object * diff --git a/src/modules/elementary/prefs/elm_datetime.c b/src/modules/elementary/prefs/elm_datetime.c index 6b0f532f89..54728a317f 100644 --- a/src/modules/elementary/prefs/elm_datetime.c +++ b/src/modules/elementary/prefs/elm_datetime.c @@ -6,13 +6,12 @@ static Elm_Prefs_Item_Type supported_types[] = ELM_PREFS_TYPE_UNKNOWN }; -static Eina_Bool +static void _item_changed_cb(void *data, const Eo_Event *event) { Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; prefs_it_changed_cb(event->object); - return EINA_TRUE; } static Evas_Object * diff --git a/src/modules/elementary/prefs/elm_entry.c b/src/modules/elementary/prefs/elm_entry.c index b9566094ed..99cb749aaa 100644 --- a/src/modules/elementary/prefs/elm_entry.c +++ b/src/modules/elementary/prefs/elm_entry.c @@ -95,13 +95,12 @@ mismatch: return EINA_FALSE; } -static Eina_Bool +static void _item_changed_cb(void *data, const Eo_Event *event) { Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; prefs_it_changed_cb(event->object); - return EINA_TRUE; } static void diff --git a/src/modules/elementary/prefs/elm_slider.c b/src/modules/elementary/prefs/elm_slider.c index 635eb24692..cba1ed040f 100644 --- a/src/modules/elementary/prefs/elm_slider.c +++ b/src/modules/elementary/prefs/elm_slider.c @@ -7,13 +7,12 @@ static Elm_Prefs_Item_Type supported_types[] = ELM_PREFS_TYPE_UNKNOWN }; -static Eina_Bool +static void _item_changed_cb(void *data, const Eo_Event *event) { Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; prefs_it_changed_cb(event->object); - return EINA_TRUE; } static Evas_Object * diff --git a/src/modules/elementary/prefs/elm_spinner.c b/src/modules/elementary/prefs/elm_spinner.c index 063b998c38..01a7a3c275 100644 --- a/src/modules/elementary/prefs/elm_spinner.c +++ b/src/modules/elementary/prefs/elm_spinner.c @@ -7,13 +7,12 @@ static Elm_Prefs_Item_Type supported_types[] = ELM_PREFS_TYPE_UNKNOWN }; -static Eina_Bool +static void _item_changed_cb(void *data, const Eo_Event *event) { Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; prefs_it_changed_cb(event->object); - return EINA_TRUE; } static Evas_Object * diff --git a/src/modules/ethumb/emotion/emotion.c b/src/modules/ethumb/emotion/emotion.c index e9a9eeee67..8fe042409a 100644 --- a/src/modules/ethumb/emotion/emotion.c +++ b/src/modules/ethumb/emotion/emotion.c @@ -80,7 +80,7 @@ _resize_movie(struct _emotion_plugin *_plugin) emotion_object_audio_mute_set(_plugin->video, 1); } -static Eina_Bool +static void _frame_decode_cb(void *data, const Eo_Event *event EINA_UNUSED) { struct _emotion_plugin *_plugin = data; @@ -90,18 +90,16 @@ _frame_decode_cb(void *data, const Eo_Event *event EINA_UNUSED) else _frame_grab_single(data); - return EINA_TRUE; + return; } -static Eina_Bool +static void _frame_resized_cb(void *data, const Eo_Event *event EINA_UNUSED) { _resize_movie(data); - - return EINA_TRUE; } -static Eina_Bool +static void _video_stopped_cb(void *data, const Eo_Event *event EINA_UNUSED) { struct _emotion_plugin *_plugin = data; @@ -111,8 +109,6 @@ _video_stopped_cb(void *data, const Eo_Event *event EINA_UNUSED) _plugin->ptotal = 0; _plugin->first = EINA_FALSE; _plugin->total_time = _plugin->tmp_time; - - return EINA_TRUE; } static void diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c index 35e68794c2..9857645019 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_preload.c +++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c @@ -299,14 +299,12 @@ evas_gl_preload_render_relax(evas_gl_make_current_cb make_current, void *engine_ evas_gl_preload_render_lock(make_current, engine_data); } -static Eina_Bool +static void _evas_gl_preload_target_die(void *data, const Eo_Event *event) { Evas_GL_Texture *tex = data; evas_gl_preload_target_unregister(tex, event->object); - - return EO_CALLBACK_CONTINUE; } void diff --git a/src/tests/ecore/ecore_test_args.c b/src/tests/ecore/ecore_test_args.c index 84ff61aeee..eb6d13c3e2 100644 --- a/src/tests/ecore/ecore_test_args.c +++ b/src/tests/ecore/ecore_test_args.c @@ -5,7 +5,7 @@ #include <Ecore.h> #include "ecore_suite.h" -static Eina_Bool +static void _cb_args1(void *data EINA_UNUSED, const Eo_Event *event) { Efl_Loop_Args *args = event->info; @@ -22,7 +22,6 @@ _cb_args1(void *data EINA_UNUSED, const Eo_Event *event) fail_if(!!strcmp(efl_loop_args_arg_get(args, 6), "g")); fail_if(!!strcmp(efl_loop_args_arg_get(args, 7), "h")); ecore_main_loop_quit(); - return EO_CALLBACK_CONTINUE; } START_TEST(ecore_test_args1) @@ -41,7 +40,7 @@ START_TEST(ecore_test_args1) } END_TEST -static Eina_Bool +static void _cb_args2(void *data EINA_UNUSED, const Eo_Event *event) { Efl_Loop_Args *args = event->info; @@ -51,7 +50,6 @@ _cb_args2(void *data EINA_UNUSED, const Eo_Event *event) fail_if(n != 1); fail_if(!!strcmp(efl_loop_args_arg_get(args, 0), "hello world")); ecore_main_loop_quit(); - return EO_CALLBACK_CONTINUE; } START_TEST(ecore_test_args2) @@ -70,7 +68,7 @@ START_TEST(ecore_test_args2) } END_TEST -static Eina_Bool +static void _cb_args3(void *data EINA_UNUSED, const Eo_Event *event) { Efl_Loop_Args *args = event->info; @@ -79,7 +77,6 @@ _cb_args3(void *data EINA_UNUSED, const Eo_Event *event) n = efl_loop_args_arg_num_get(args); fail_if(n != 0); ecore_main_loop_quit(); - return EO_CALLBACK_CONTINUE; } START_TEST(ecore_test_args3) @@ -93,7 +90,7 @@ START_TEST(ecore_test_args3) } END_TEST -static Eina_Bool +static void _cb_args4(void *data EINA_UNUSED, const Eo_Event *event) { Efl_Loop_Args *args = event->info; @@ -105,7 +102,6 @@ _cb_args4(void *data EINA_UNUSED, const Eo_Event *event) fail_if(!!strcmp(efl_loop_args_arg_get(args, 1), "xxxxx")); fail_if(!!strcmp(efl_loop_args_arg_get(args, 2), "y")); ecore_main_loop_quit(); - return EO_CALLBACK_CONTINUE; } START_TEST(ecore_test_args4) diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c index 338bb74a20..41858c0558 100644 --- a/src/tests/ecore/ecore_test_ecore.c +++ b/src/tests/ecore/ecore_test_ecore.c @@ -267,15 +267,13 @@ START_TEST(ecore_test_ecore_main_loop_fd_handler) } END_TEST -static Eina_Bool +static void _eo_read_cb(void *data, const Eo_Event *info EINA_UNUSED) { Eina_Bool *did = data; *did = EINA_TRUE; ecore_main_loop_quit(); - - return EO_CALLBACK_CONTINUE; } START_TEST(ecore_test_efl_loop_fd) @@ -310,14 +308,12 @@ START_TEST(ecore_test_efl_loop_fd) } END_TEST -static Eina_Bool +static void _eo_del_cb(void *data, const Eo_Event *ev EINA_UNUSED) { Eina_Bool *dead = data; *dead = EINA_TRUE; - - return EINA_TRUE; } START_TEST(ecore_test_efl_loop_fd_lifecycle) diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c index 480e5a2b8b..dda71e3be6 100644 --- a/src/tests/ecore/ecore_test_ecore_audio.c +++ b/src/tests/ecore/ecore_test_ecore_audio.c @@ -11,7 +11,7 @@ #include "ecore_suite.h" -static Eina_Bool _failed_cb(void *data, const Eo_Event *event EINA_UNUSED) +static void _failed_cb(void *data, const Eo_Event *event EINA_UNUSED) { Eina_Bool *pulse_context_failed = data; @@ -21,22 +21,16 @@ static Eina_Bool _failed_cb(void *data, const Eo_Event *event EINA_UNUSED) *pulse_context_failed = (pa_check == 0); } ecore_main_loop_quit(); - - return EINA_TRUE; } -static Eina_Bool _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) +static void _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { ecore_main_loop_quit(); - - return EINA_TRUE; } -static Eina_Bool _looped_cb(void *data EINA_UNUSED, const Eo_Event *event) +static void _looped_cb(void *data EINA_UNUSED, const Eo_Event *event) { ecore_audio_obj_in_looped_set(event->object, EINA_FALSE); - - return EINA_TRUE; } #ifdef HAVE_PULSE diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c index 336538f164..4394643548 100644 --- a/src/tests/ecore/ecore_test_timer.c +++ b/src/tests/ecore/ecore_test_timer.c @@ -252,20 +252,18 @@ _test_time_cb(void *data) return EINA_TRUE; } -static Eina_Bool +static void _test_death_cb(void *data, const Eo_Event *ev EINA_UNUSED) { Eina_Bool *die = data; *die = EINA_TRUE; - - return EINA_TRUE; } -static Eina_Bool +static void _test_run_cb(void *data, const Eo_Event *ev EINA_UNUSED) { - return _test_time_cb(data); + _test_time_cb(data); } START_TEST(ecore_test_timer_lifecycle) diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c index 919797a184..d6c54befef 100644 --- a/src/tests/eio/eio_model_test_monitor_add.c +++ b/src/tests/eio/eio_model_test_monitor_add.c @@ -21,7 +21,7 @@ struct _pair Eo *parent, *child; }; -static Eina_Bool +static void _children_removed_cb(void *data EINA_UNUSED, const Eo_Event* event) { fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__); @@ -39,10 +39,9 @@ _children_removed_cb(void *data EINA_UNUSED, const Eo_Event* event) free(filename); eina_promise_unref(promise); } - return EINA_TRUE; } -static Eina_Bool +static void _children_added_cb(void *data EINA_UNUSED, const Eo_Event* event) { fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__); @@ -61,8 +60,6 @@ _children_added_cb(void *data EINA_UNUSED, const Eo_Event* event) free(filename); eina_promise_unref(promise); - - return EINA_TRUE; } static void diff --git a/src/tests/eio/eio_test_job_xattr.c b/src/tests/eio/eio_test_job_xattr.c index f2fd2bbd24..52a988a38a 100644 --- a/src/tests/eio/eio_test_job_xattr.c +++ b/src/tests/eio/eio_test_job_xattr.c @@ -35,12 +35,12 @@ static const char *attr_data[] = int total_attributes = sizeof(attribute)/sizeof(attribute[0]); -static Eina_Bool +static void _filter_cb(void *data EINA_UNUSED, const Eo_Event *event) { Eio_Filter_Name_Data *event_info = event->info; - return event_info->filter = EINA_TRUE; + event_info->filter = EINA_TRUE; } static void diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c index 4f3c6c768e..5a7247a557 100644 --- a/src/tests/eio/eio_test_sentry.c +++ b/src/tests/eio/eio_test_sentry.c @@ -104,11 +104,10 @@ static Eina_Bool _modify_attrib_file(void *data) /////// helper functions -static Eina_Bool _check_event_path(void *data, const Eo_Event *event) +static void _check_event_path(void *data, const Eo_Event *event) { Eio_Sentry_Event *event_info = event->info; ck_assert_str_eq((const char*)data, event_info->trigger); - return EINA_TRUE; } static Eina_Tmpstr *_common_init() @@ -220,11 +219,9 @@ END_TEST static void _target_notified_cb(void *data, const Eo_Event *event) { - if (_check_event_path(data, event)) - { - _cancel_timeout(); - ecore_main_loop_quit(); - } + _check_event_path(data, event); + _cancel_timeout(); + ecore_main_loop_quit(); } diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c index 9d6c74c50d..9c63e8b2a4 100644 --- a/src/tests/eldbus/eldbus_test_eldbus_model.c +++ b/src/tests/eldbus/eldbus_test_eldbus_model.c @@ -64,11 +64,11 @@ _error_then_cb(void* data EINA_UNUSED, Eina_Error error) ecore_main_loop_quit(); } -static Eina_Bool +static void _eo_event_quit_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { ecore_main_loop_quit(); - return EINA_FALSE; + eo_event_callback_stop(event->object); } void * diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c index aeab09042d..3bd1790bb7 100644 --- a/src/tests/elementary/elm_test_genlist.c +++ b/src/tests/elementary/elm_test_genlist.c @@ -80,17 +80,15 @@ START_TEST(elm_atspi_children_get2) } END_TEST -static Eina_Bool +static void _children_changed_cb(void *data EINA_UNUSED, const Eo_Event *event) { if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED) - return EINA_TRUE; + return; ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info; current = event->object; counter++; - - return EINA_TRUE; } START_TEST(elm_atspi_children_events_add) diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c index 755f5be42c..e960ac646a 100644 --- a/src/tests/elementary/elm_test_image.c +++ b/src/tests/elementary/elm_test_image.c @@ -34,17 +34,16 @@ START_TEST (elm_atspi_role_get) } END_TEST -static Eina_Bool +static void _async_error_cb(void *data, const Eo_Event *event) { Test_Data *td = data; char path[PATH_MAX]; sprintf(path, pathfmt, td->image_id); efl_file_set(event->object, path, NULL); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _async_opened_cb(void *data, const Eo_Event *event) { Test_Data *td = data; @@ -63,7 +62,7 @@ _async_opened_cb(void *data, const Eo_Event *event) td->image_id++; sprintf(path, pathfmt, td->image_id); efl_file_set(event->object, path, NULL); - return EO_CALLBACK_CONTINUE; + return; } else if (td->image_id < MAX_IMAGE_ID) { @@ -73,13 +72,11 @@ _async_opened_cb(void *data, const Eo_Event *event) sprintf(path, pathfmt, ++td->image_id); efl_file_set(event->object, path, NULL); } - return EO_CALLBACK_CONTINUE; + return; } td->success = 1; ecore_main_loop_quit(); - - return EO_CALLBACK_CONTINUE; } static Eina_Bool diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c index 48b0535623..f8ed415acd 100644 --- a/src/tests/emotion/emotion_test_main-eo.c +++ b/src/tests/emotion/emotion_test_main-eo.c @@ -56,7 +56,7 @@ struct _Frame_Data Evas_Coord x, y; }; -static Eina_Bool bg_key_down(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED); +static void bg_key_down(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED); static Evas_Object *o_bg = NULL; @@ -131,7 +131,7 @@ broadcast_event(Emotion_Event ev) emotion_object_event_simple_send(obj, ev); } -static Eina_Bool +static void bg_key_down(void *data EINA_UNUSED, const Eo_Event *event) { Efl_Event_Key *ev = event->info; @@ -139,7 +139,7 @@ bg_key_down(void *data EINA_UNUSED, const Eo_Event *event) Evas_Object *o; const char *keyname = efl_event_key_name_get(ev); - if (!keyname) return EO_CALLBACK_CONTINUE; + if (!keyname) return; if (!strcmp(keyname, "Escape")) ecore_main_loop_quit(); @@ -288,15 +288,12 @@ bg_key_down(void *data EINA_UNUSED, const Eo_Event *event) { printf("UNHANDLED: %s\n", keyname); } - - return EINA_TRUE; } -static Eina_Bool +static void _oe_free_cb(void *data, const Eo_Event *event EINA_UNUSED) { free(data); - return EINA_TRUE; } static void @@ -326,7 +323,7 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje) edje_obj_part_text_set(edje, "video_progress_txt", buf); } -static Eina_Bool +static void video_obj_frame_decode_cb(void *data, const Eo_Event *event) { video_obj_time_changed(event->object, data); @@ -339,10 +336,9 @@ video_obj_frame_decode_cb(void *data, const Eo_Event *event) printf("FPS: %3.3f\n", 1.0 / (t - pt)); pt = t; } - return EINA_TRUE; } -static Eina_Bool +static void video_obj_frame_resize_cb(void *data, const Eo_Event *event) { Evas_Object *oe; @@ -361,29 +357,23 @@ video_obj_frame_resize_cb(void *data, const Eo_Event *event) efl_gfx_size_set(oe, w, h); evas_object_size_hint_min_set(event->object, 0, 0); edje_object_part_swallow(oe, "video_swallow", event->object); - - return EINA_TRUE; } -static Eina_Bool +static void video_obj_length_change_cb(void *data, const Eo_Event *event) { printf("len change!\n"); video_obj_time_changed(event->object, data); - - return EINA_TRUE; } -static Eina_Bool +static void video_obj_position_update_cb(void *data, const Eo_Event *event) { printf("pos up!\n"); video_obj_time_changed(event->object, data); - - return EINA_TRUE; } -static Eina_Bool +static void video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event) { printf("video stopped!!!\n"); @@ -392,65 +382,51 @@ video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event) emotion_object_position_set(event->object, 0.0); emotion_object_play_set(event->object, EINA_TRUE); } - - return EINA_TRUE; } -static Eina_Bool +static void video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event) { printf("channels changed: [AUD %i][VID %i][SPU %i]\n", emotion_object_audio_channel_count(event->object), emotion_object_video_channel_count(event->object), emotion_object_spu_channel_count(event->object)); - - return EINA_TRUE; } -static Eina_Bool +static void video_obj_title_cb(void *data EINA_UNUSED, const Eo_Event *event) { printf("video title to: \"%s\"\n", emotion_object_title_get(event->object)); - - return EINA_TRUE; } -static Eina_Bool +static void video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event) { printf("progress: \"%s\" %3.3f\n", emotion_object_progress_info_get(event->object), emotion_object_progress_status_get(event->object)); - - return EINA_TRUE; } -static Eina_Bool +static void video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event) { printf("video ref to: \"%s\" %i\n", emotion_object_ref_file_get(event->object), emotion_object_ref_num_get(event->object)); - - return EINA_TRUE; } -static Eina_Bool +static void video_obj_button_num_cb(void *data EINA_UNUSED, const Eo_Event *event) { printf("video spu buttons to: %i\n", emotion_object_spu_button_count_get(event->object)); - - return EINA_TRUE; } -static Eina_Bool +static void video_obj_button_cb(void *data EINA_UNUSED, const Eo_Event *event) { printf("video selected spu button: %i\n", emotion_object_spu_button_get(event->object)); - - return EINA_TRUE; } static void diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c index bec7fcb190..c745f6c0ae 100644 --- a/src/tests/eo/composite_objects/composite_objects_main.c +++ b/src/tests/eo/composite_objects/composite_objects_main.c @@ -10,15 +10,13 @@ static int cb_called = EINA_FALSE; -static Eina_Bool +static void _a_changed_cb(void *data, const Eo_Event *event) { int new_a = *((int *) event->info); printf("%s event_info:'%d' data:'%s'\n", __func__, new_a, (const char *) data); cb_called = EINA_TRUE; - - return EO_CALLBACK_CONTINUE; } int diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c index 5c33bc5efb..dce0d0eea6 100644 --- a/src/tests/eo/signals/signals_main.c +++ b/src/tests/eo/signals/signals_main.c @@ -9,13 +9,12 @@ static int cb_count = 0; -static Eina_Bool +static void _null_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _a_changed_cb(void *data, const Eo_Event *event) { int new_a = *((int *) event->info); @@ -27,22 +26,23 @@ _a_changed_cb(void *data, const Eo_Event *event) eo_event_callback_del(event->object, EV_A_CHANGED, _null_cb, (void *) 23423); /* Stop as we reached the 3rd one. */ - return (cb_count != 3); + if (cb_count == 3) + eo_event_callback_stop(event->object); } static Eina_Bool inside = EINA_FALSE; static int called = 0; -static Eina_Bool +static void _restart_1_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { fprintf(stderr, "restart 1 inside: %i\n", inside); fail_if(!inside); called++; - return EINA_FALSE; + eo_event_callback_stop(event->object); } -static Eina_Bool +static void _restart_2_cb(void *data, const Eo_Event *event) { fprintf(stderr, "restart 2 inside: %i\n", inside); @@ -55,7 +55,7 @@ _restart_2_cb(void *data, const Eo_Event *event) called++; fprintf(stderr, "restart 2 exit inside: %i (%i)\n", inside, called); - return EINA_FALSE; + eo_event_callback_stop(event->object); } int diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c index f7cad686d2..508dbcf07b 100644 --- a/src/tests/eo/signals/signals_simple.c +++ b/src/tests/eo/signals/signals_simple.c @@ -28,34 +28,32 @@ _a_set(Eo *obj, void *class_data, int a) eo_event_callback_call(obj, EV_A_CHANGED, &pd->a); } -Eina_Bool +void _cb_added(void *data EINA_UNUSED, const Eo_Event *event) { Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS); const Eo_Callback_Array_Item *callback_array = event->info; if (callback_array->desc != EV_A_CHANGED) - return EINA_TRUE; + return; pd->cb_count++; printf("Added EV_A_CHANGED callback to %p. Count: %d\n", event->object, pd->cb_count); - return EO_CALLBACK_CONTINUE; } -Eina_Bool +void _cb_deled(void *data EINA_UNUSED, const Eo_Event *event) { Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS); const Eo_Callback_Array_Item *callback_array = event->info; if (callback_array->desc != EV_A_CHANGED) - return EINA_TRUE; + return; pd->cb_count--; printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", event->object, pd->cb_count); - return EO_CALLBACK_CONTINUE; } static Eo * diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index f7c8962523..51d0d6714d 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -113,39 +113,36 @@ END_TEST static int _eo_signals_cb_current = 0; static int _eo_signals_cb_flag = 0; -static Eina_Bool +static void _eo_signals_a_changed_cb(void *_data, const Eo_Event *event EINA_UNUSED) { int data = (intptr_t) _data; _eo_signals_cb_current++; ck_assert_int_eq(data, _eo_signals_cb_current); _eo_signals_cb_flag |= 0x1; - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _eo_signals_a_changed_cb2(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { _eo_signals_cb_flag |= 0x2; - return EO_CALLBACK_STOP; + eo_event_callback_stop(event->object); } -static Eina_Bool +static void _eo_signals_a_changed_never(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { /* This one should never be called. */ fail_if(1); - return EO_CALLBACK_CONTINUE; } -static Eina_Bool +static void _eo_signals_eo_del_cb(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) { _eo_signals_cb_flag |= 0x4; - return EO_CALLBACK_CONTINUE; } -Eina_Bool +void _eo_signals_cb_added_deled(void *data, const Eo_Event *event) { const Eo_Callback_Array_Item *callback_array = event->info; @@ -153,8 +150,6 @@ _eo_signals_cb_added_deled(void *data, const Eo_Event *event) fail_if((callback_data() != callback_array) && (callback_array->func != _eo_signals_cb_added_deled)); - - return EO_CALLBACK_CONTINUE; } EO_CALLBACKS_ARRAY_DEFINE(_eo_signals_callbacks, diff --git a/src/tests/eolian/data/typedef_ref.c b/src/tests/eolian/data/typedef_ref.c index 6f07d3a27d..14d0dfd8d6 100644 --- a/src/tests/eolian/data/typedef_ref.c +++ b/src/tests/eolian/data/typedef_ref.c @@ -19,7 +19,7 @@ typedef Evas_Coord Evas_Coord2; typedef Evas_Coord2 Evas_Coord3; -typedef Eina_Bool (*Event)(void *data, const Eo_Event *event); +typedef void (*Event)(void *data, const Eo_Event *event); typedef enum { diff --git a/src/tests/eolian/data/typedef_ref_stub.c b/src/tests/eolian/data/typedef_ref_stub.c index 9ba5294ee4..033d5dac53 100644 --- a/src/tests/eolian/data/typedef_ref_stub.c +++ b/src/tests/eolian/data/typedef_ref_stub.c @@ -11,7 +11,7 @@ typedef Evas_Coord Evas_Coord2; typedef Evas_Coord2 Evas_Coord3; -typedef Eina_Bool (*Event)(void *data, const Eo_Event *event); +typedef void (*Event)(void *data, const Eo_Event *event); #endif |