summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/benchmarks/eo/eo_bench_callbacks.c3
-rw-r--r--src/bin/elementary/test_anim.c3
-rw-r--r--src/bin/elementary/test_application_server.c18
-rw-r--r--src/bin/elementary/test_code.c7
-rw-r--r--src/bin/elementary/test_entry.c3
-rw-r--r--src/bin/elementary/test_events.c28
-rw-r--r--src/bin/elementary/test_grid_static.c9
-rw-r--r--src/bin/elementary/test_task_switcher.c7
-rw-r--r--src/bin/elementary/test_ui_box.c37
-rw-r--r--src/bin/elementary/test_ui_grid.c33
-rw-r--r--src/bin/elementary/test_win_plug.c4
-rw-r--r--src/examples/ecore/ecore_audio_playback.c2
-rw-r--r--src/examples/ecore/ecore_audio_to_ogg.c2
-rw-r--r--src/examples/eio/eio_sentry.c4
-rw-r--r--src/examples/elementary/filemvc.c6
-rw-r--r--src/examples/emotion/emotion_basic_example.c4
-rw-r--r--src/examples/emotion/emotion_border_example.c24
-rw-r--r--src/examples/emotion/emotion_generic_example.c24
-rw-r--r--src/examples/emotion/emotion_generic_subtitle_example.c4
-rw-r--r--src/examples/emotion/emotion_signals_example.c28
-rw-r--r--src/examples/evas/evas-3d-shadows.c8
-rw-r--r--src/lib/ecore/ecore_idler.c8
-rw-r--r--src/lib/ecore/ecore_main.c20
-rw-r--r--src/lib/ecore/ecore_private.h4
-rw-r--r--src/lib/ecore/ecore_timer.c24
-rw-r--r--src/lib/ecore/efl_loop_fd.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c8
-rw-r--r--src/lib/ecore_con/ecore_con_url.c22
-rw-r--r--src/lib/ecore_evas/ecore_evas.c16
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c4
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.c4
-rw-r--r--src/lib/edje/edje_callbacks.c52
-rw-r--r--src/lib/edje/edje_multisense.c7
-rw-r--r--src/lib/edje/edje_private.h2
-rw-r--r--src/lib/efl/interfaces/efl_vpath_manager.c3
-rw-r--r--src/lib/elementary/efl_ui_box.c8
-rw-r--r--src/lib/elementary/efl_ui_grid.c6
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c32
-rw-r--r--src/lib/elementary/efl_ui_win.c37
-rw-r--r--src/lib/elementary/elc_combobox.c31
-rw-r--r--src/lib/elementary/elc_fileselector.c126
-rw-r--r--src/lib/elementary/elc_fileselector_button.c8
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c14
-rw-r--r--src/lib/elementary/elc_hoversel.c28
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c36
-rw-r--r--src/lib/elementary/elc_naviframe.c9
-rw-r--r--src/lib/elementary/elc_player.c101
-rw-r--r--src/lib/elementary/elc_popup.c29
-rw-r--r--src/lib/elementary/elm_app_server.c3
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c166
-rw-r--r--src/lib/elementary/elm_box.c18
-rw-r--r--src/lib/elementary/elm_cnp.c3
-rw-r--r--src/lib/elementary/elm_code_widget.c13
-rw-r--r--src/lib/elementary/elm_color_class.c18
-rw-r--r--src/lib/elementary/elm_colorselector.c16
-rw-r--r--src/lib/elementary/elm_conform.c20
-rw-r--r--src/lib/elementary/elm_dayselector.c4
-rw-r--r--src/lib/elementary/elm_entry.c17
-rw-r--r--src/lib/elementary/elm_frame.c4
-rw-r--r--src/lib/elementary/elm_genlist.c4
-rw-r--r--src/lib/elementary/elm_glview.c13
-rw-r--r--src/lib/elementary/elm_helper.c5
-rw-r--r--src/lib/elementary/elm_helper.h2
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.c3
-rw-r--r--src/lib/elementary/elm_interface_atspi_image.c4
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c54
-rw-r--r--src/lib/elementary/elm_map.c7
-rw-r--r--src/lib/elementary/elm_menu.c12
-rw-r--r--src/lib/elementary/elm_panel.c4
-rw-r--r--src/lib/elementary/elm_photo.c4
-rw-r--r--src/lib/elementary/elm_photocam.c13
-rw-r--r--src/lib/elementary/elm_spinner.c32
-rw-r--r--src/lib/elementary/elm_store.c10
-rw-r--r--src/lib/elementary/elm_video.c36
-rw-r--r--src/lib/elementary/elm_view_form.c10
-rw-r--r--src/lib/elementary/elm_view_list.c40
-rw-r--r--src/lib/elementary/elm_widget.c41
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c6
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c16
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node_callback.h4
-rw-r--r--src/lib/evas/canvas/evas_clip.c8
-rw-r--r--src/lib/evas/canvas/evas_device.c4
-rw-r--r--src/lib/evas/canvas/evas_events.c11
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c4
-rw-r--r--src/lib/evas/canvas/evas_object_box.c16
-rw-r--r--src/lib/evas/canvas/evas_object_main.c12
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c3
-rw-r--r--src/lib/evas/canvas/evas_object_table.c10
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c4
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c4
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c3
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.c5
-rw-r--r--src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c32
-rw-r--r--src/modules/elementary/prefs/elm_button.c3
-rw-r--r--src/modules/elementary/prefs/elm_check.c3
-rw-r--r--src/modules/elementary/prefs/elm_datetime.c3
-rw-r--r--src/modules/elementary/prefs/elm_entry.c3
-rw-r--r--src/modules/elementary/prefs/elm_slider.c3
-rw-r--r--src/modules/elementary/prefs/elm_spinner.c3
-rw-r--r--src/modules/ethumb/emotion/emotion.c12
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c4
-rw-r--r--src/tests/ecore/ecore_test_args.c12
-rw-r--r--src/tests/ecore/ecore_test_ecore.c8
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c12
-rw-r--r--src/tests/ecore/ecore_test_timer.c8
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c7
-rw-r--r--src/tests/eio/eio_test_job_xattr.c4
-rw-r--r--src/tests/eio/eio_test_sentry.c11
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c4
-rw-r--r--src/tests/elementary/elm_test_genlist.c6
-rw-r--r--src/tests/elementary/elm_test_image.c11
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c54
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c4
-rw-r--r--src/tests/eo/signals/signals_main.c16
-rw-r--r--src/tests/eo/signals/signals_simple.c10
-rw-r--r--src/tests/eo/suite/eo_test_general.c17
-rw-r--r--src/tests/eolian/data/typedef_ref.c2
-rw-r--r--src/tests/eolian/data/typedef_ref_stub.c2
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 cb0fc0e..69ea71e 100644
--- a/src/benchmarks/eo/eo_bench_callbacks.c
+++ b/src/benchmarks/eo/eo_bench_callbacks.c
@@ -6,10 +6,9 @@
6#include "eo_bench.h" 6#include "eo_bench.h"
7#include "class_simple.h" 7#include "class_simple.h"
8 8
9static Eina_Bool 9static void
10_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 10_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
11{ 11{
12 return EO_CALLBACK_CONTINUE;
13} 12}
14 13
15 14
diff --git a/src/bin/elementary/test_anim.c b/src/bin/elementary/test_anim.c
index e5d97c2..0cb608d 100644
--- a/src/bin/elementary/test_anim.c
+++ b/src/bin/elementary/test_anim.c
@@ -10,7 +10,7 @@ static const char *names[] =
10 "bub3", "sh3", 10 "bub3", "sh3",
11}; 11};
12 12
13static Eina_Bool 13static void
14_anim_tick(void *data EINA_UNUSED, const Eo_Event *event) 14_anim_tick(void *data EINA_UNUSED, const Eo_Event *event)
15{ 15{
16 Evas_Object *bub, *sh; 16 Evas_Object *bub, *sh;
@@ -49,7 +49,6 @@ _anim_tick(void *data EINA_UNUSED, const Eo_Event *event)
49 evas_object_move(sh, x, y); 49 evas_object_move(sh, x, y);
50 evas_object_resize(sh, w, h); 50 evas_object_resize(sh, w, h);
51 } 51 }
52 return ECORE_CALLBACK_RENEW;
53} 52}
54 53
55void 54void
diff --git a/src/bin/elementary/test_application_server.c b/src/bin/elementary/test_application_server.c
index f2b5cf0..7e89319 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)
39 evas_object_show(ctx->win); 39 evas_object_show(ctx->win);
40} 40}
41 41
42static Eina_Bool 42static void
43_close_cb(void *data, const Eo_Event *event) 43_close_cb(void *data, const Eo_Event *event)
44{ 44{
45 App_View_Context *ctx = data; 45 App_View_Context *ctx = data;
46 if (ctx->win) 46 if (ctx->win)
47 evas_object_del(ctx->win); 47 evas_object_del(ctx->win);
48 eo_del(event->object); 48 eo_del(event->object);
49 return EINA_TRUE;
50} 49}
51 50
52static Eina_Bool 51static void
53_pause_cb(void *data, const Eo_Event *event EINA_UNUSED) 52_pause_cb(void *data, const Eo_Event *event EINA_UNUSED)
54{ 53{
55 App_View_Context *ctx = data; 54 App_View_Context *ctx = data;
56 _text_update(ctx, "paused"); 55 _text_update(ctx, "paused");
57 return EINA_TRUE;
58} 56}
59 57
60static Eina_Bool 58static void
61_resume_cb(void *data, const Eo_Event *event) 59_resume_cb(void *data, const Eo_Event *event)
62{ 60{
63 App_View_Context *ctx = data; 61 App_View_Context *ctx = data;
@@ -70,10 +68,9 @@ _resume_cb(void *data, const Eo_Event *event)
70 } 68 }
71 69
72 _text_update(ctx, "alive"); 70 _text_update(ctx, "alive");
73 return EINA_TRUE;
74} 71}
75 72
76static Eina_Bool 73static void
77_view_del_cb(void *data, const Eo_Event *event) 74_view_del_cb(void *data, const Eo_Event *event)
78{ 75{
79 App_View_Context *ctx = data; 76 App_View_Context *ctx = data;
@@ -83,7 +80,6 @@ _view_del_cb(void *data, const Eo_Event *event)
83 elm_app_server_view_window_set(event->object, NULL); 80 elm_app_server_view_window_set(event->object, NULL);
84 eina_stringshare_del(ctx->view_name); 81 eina_stringshare_del(ctx->view_name);
85 free(ctx); 82 free(ctx);
86 return EINA_TRUE;
87} 83}
88 84
89static Elm_App_Server_View * 85static Elm_App_Server_View *
@@ -120,7 +116,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
120 return view; 116 return view;
121} 117}
122 118
123static Eina_Bool 119static void
124_terminate_cb(void *data EINA_UNUSED, const Eo_Event *event) 120_terminate_cb(void *data EINA_UNUSED, const Eo_Event *event)
125{ 121{
126 const char *title = NULL; 122 const char *title = NULL;
@@ -131,7 +127,6 @@ _terminate_cb(void *data EINA_UNUSED, const Eo_Event *event)
131 127
132 printf("Closing: %s\n", title); 128 printf("Closing: %s\n", title);
133 eo_unref(event->object); 129 eo_unref(event->object);
134 return EINA_TRUE;
135} 130}
136 131
137Elm_App_Server * 132Elm_App_Server *
@@ -167,12 +162,11 @@ test_application_server_common(const char *pkg)
167 return server; 162 return server;
168} 163}
169 164
170static Eina_Bool 165static void
171_server_del_cb(void *data, const Eo_Event *event EINA_UNUSED) 166_server_del_cb(void *data, const Eo_Event *event EINA_UNUSED)
172{ 167{
173 Elm_App_Server **server = data; 168 Elm_App_Server **server = data;
174 *server = NULL; 169 *server = NULL;
175 return EINA_TRUE;
176} 170}
177 171
178void 172void
diff --git a/src/bin/elementary/test_code.c b/src/bin/elementary/test_code.c
index ed2d7ad..66fee91 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)
23 elm_code_file_line_append(file, line, length, NULL); 23 elm_code_file_line_append(file, line, length, NULL);
24} 24}
25 25
26static Eina_Bool 26static void
27_elm_code_test_line_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event) 27_elm_code_test_line_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event)
28{ 28{
29 Elm_Code_Line *line; 29 Elm_Code_Line *line;
@@ -31,10 +31,9 @@ _elm_code_test_line_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event)
31 line = (Elm_Code_Line *)event->info; 31 line = (Elm_Code_Line *)event->info;
32 32
33 printf("CLICKED line %d\n", line->number); 33 printf("CLICKED line %d\n", line->number);
34 return EO_CALLBACK_CONTINUE;
35} 34}
36 35
37static Eina_Bool 36static void
38_elm_code_test_line_done_cb(void *data EINA_UNUSED, const Eo_Event *event) 37_elm_code_test_line_done_cb(void *data EINA_UNUSED, const Eo_Event *event)
39{ 38{
40 Elm_Code_Line *line; 39 Elm_Code_Line *line;
@@ -46,7 +45,7 @@ _elm_code_test_line_done_cb(void *data EINA_UNUSED, const Eo_Event *event)
46 else if (line->number == 4) 45 else if (line->number == 4)
47 line->status = ELM_CODE_STATUS_TYPE_ERROR; 46 line->status = ELM_CODE_STATUS_TYPE_ERROR;
48 47
49 return EO_CALLBACK_STOP; 48 eo_event_callback_stop(event->object);
50} 49}
51 50
52static Evas_Object * 51static Evas_Object *
diff --git a/src/bin/elementary/test_entry.c b/src/bin/elementary/test_entry.c
index 5077d37..c56e093 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
358 elm_entry_end_visible_set(en, EINA_FALSE); 358 elm_entry_end_visible_set(en, EINA_FALSE);
359} 359}
360 360
361static Eina_Bool 361static void
362_context_menu_show_cb(void *data EINA_UNUSED, const Eo_Event *event) 362_context_menu_show_cb(void *data EINA_UNUSED, const Eo_Event *event)
363{ 363{
364 elm_entry_context_menu_clear(event->object); 364 elm_entry_context_menu_clear(event->object);
365 elm_entry_context_menu_item_add(event->object, "MenuD1", NULL, ELM_ICON_NONE, _item_cb, NULL); 365 elm_entry_context_menu_item_add(event->object, "MenuD1", NULL, ELM_ICON_NONE, _item_cb, NULL);
366 elm_entry_context_menu_item_add(event->object, "MenuD2", NULL, ELM_ICON_NONE, _item_cb, NULL); 366 elm_entry_context_menu_item_add(event->object, "MenuD2", NULL, ELM_ICON_NONE, _item_cb, NULL);
367 return EO_CALLBACK_CONTINUE;
368} 367}
369 368
370void 369void
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index dafdeef..5ae64ed 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -17,36 +17,33 @@ typedef struct {
17 Eo *timer; 17 Eo *timer;
18} testdata; 18} testdata;
19 19
20static Eina_Bool 20static void
21_pointer_down(void *data, const Eo_Event *ev) 21_pointer_down(void *data, const Eo_Event *ev)
22{ 22{
23 testdata *td = data; 23 testdata *td = data;
24 td->down = 1; 24 td->down = 1;
25 eo_del(td->evdown); 25 eo_del(td->evdown);
26 td->evdown = efl_event_dup(ev->info); 26 td->evdown = efl_event_dup(ev->info);
27 return 1;
28} 27}
29 28
30static Eina_Bool 29static void
31_pointer_move(void *data, const Eo_Event *ev) 30_pointer_move(void *data, const Eo_Event *ev)
32{ 31{
33 testdata *td = data; 32 testdata *td = data;
34 eo_del(td->evmove); 33 eo_del(td->evmove);
35 td->evmove = efl_event_dup(ev->info); 34 td->evmove = efl_event_dup(ev->info);
36 return 1;
37} 35}
38 36
39static Eina_Bool 37static void
40_pointer_up(void *data, const Eo_Event *ev) 38_pointer_up(void *data, const Eo_Event *ev)
41{ 39{
42 testdata *td = data; 40 testdata *td = data;
43 td->down = 0; 41 td->down = 0;
44 eo_del(td->evup); 42 eo_del(td->evup);
45 td->evup = efl_event_dup(ev->info); 43 td->evup = efl_event_dup(ev->info);
46 return 1;
47} 44}
48 45
49static Eina_Bool 46static void
50_key_down(void *data, const Eo_Event *ev) 47_key_down(void *data, const Eo_Event *ev)
51{ 48{
52 testdata *td = data; 49 testdata *td = data;
@@ -70,8 +67,6 @@ _key_down(void *data, const Eo_Event *ev)
70 eo_del(td->evkeydown); 67 eo_del(td->evkeydown);
71 td->evkeydown = efl_event_dup(ev->info); 68 td->evkeydown = efl_event_dup(ev->info);
72 } 69 }
73
74 return 1;
75} 70}
76 71
77#if 0 72#if 0
@@ -96,7 +91,7 @@ _ecore_timeout_cb(void *data)
96 91
97#endif 92#endif
98 93
99static Eina_Bool 94static void
100_key_up(void *data, const Eo_Event *ev) 95_key_up(void *data, const Eo_Event *ev)
101{ 96{
102 testdata *td = data; 97 testdata *td = data;
@@ -115,11 +110,9 @@ _key_up(void *data, const Eo_Event *ev)
115 110
116 if (td->timer) eo_del(td->timer); 111 if (td->timer) eo_del(td->timer);
117 td->timer = ecore_timer_add(0.5, _ecore_timeout_cb, td); 112 td->timer = ecore_timer_add(0.5, _ecore_timeout_cb, td);
118
119 return 1;
120} 113}
121 114
122static Eina_Bool 115static void
123_clicked_button1(void *data, const Eo_Event *ev EINA_UNUSED) 116_clicked_button1(void *data, const Eo_Event *ev EINA_UNUSED)
124{ 117{
125 testdata *td = data; 118 testdata *td = data;
@@ -131,11 +124,9 @@ _clicked_button1(void *data, const Eo_Event *ev EINA_UNUSED)
131 td->id++; 124 td->id++;
132 sprintf(buf, "Button was clicked %d time%s", td->id, td->id > 1 ? "s" : ""); 125 sprintf(buf, "Button was clicked %d time%s", td->id, td->id > 1 ? "s" : "");
133 elm_object_text_set(txt, buf); 126 elm_object_text_set(txt, buf);
134
135 return 1;
136} 127}
137 128
138static Eina_Bool 129static void
139_clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED) 130_clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED)
140{ 131{
141 testdata *td = data; 132 testdata *td = data;
@@ -166,16 +157,13 @@ _clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED)
166 td->evkeydown = NULL; 157 td->evkeydown = NULL;
167 td->evkeyup = NULL; 158 td->evkeyup = NULL;
168 } 159 }
169
170 return 1;
171} 160}
172 161
173static Eina_Bool 162static void
174_win_del(void *data, const Eo_Event *ev EINA_UNUSED) 163_win_del(void *data, const Eo_Event *ev EINA_UNUSED)
175{ 164{
176 testdata *td = data; 165 testdata *td = data;
177 free(td); 166 free(td);
178 return 1;
179} 167}
180 168
181EO_CALLBACKS_ARRAY_DEFINE(rect_pointer_callbacks, 169EO_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 0cb8936..2e1ac89 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)
64 } 64 }
65} 65}
66 66
67static Eina_Bool 67static void
68_api_bt_clicked(void *data, const Eo_Event *ev) 68_api_bt_clicked(void *data, const Eo_Event *ev)
69{ /* Will add here a SWITCH command containing code to modify test-object */ 69{ /* Will add here a SWITCH command containing code to modify test-object */
70 /* in accordance a->state value. */ 70 /* in accordance a->state value. */
@@ -77,10 +77,9 @@ _api_bt_clicked(void *data, const Eo_Event *ev)
77 sprintf(str, "Next API function (%u)", a->state); 77 sprintf(str, "Next API function (%u)", a->state);
78 elm_object_text_set(ev->object, str); 78 elm_object_text_set(ev->object, str);
79 elm_object_disabled_set(ev->object, a->state == API_STATE_LAST); 79 elm_object_disabled_set(ev->object, a->state == API_STATE_LAST);
80 return 1;
81} 80}
82 81
83static Eina_Bool 82static void
84_ch_grid(void *data, const Eo_Event *ev) 83_ch_grid(void *data, const Eo_Event *ev)
85{ 84{
86 Eo *gd = data; 85 Eo *gd = data;
@@ -91,14 +90,12 @@ _ch_grid(void *data, const Eo_Event *ev)
91 //elm_grid_pack_set(obj, x - 1, y - 1, w + 2, h + 2); 90 //elm_grid_pack_set(obj, x - 1, y - 1, w + 2, h + 2);
92 efl_pack_grid_position_get(gd, ev->object, &x, &y, &w, &h); 91 efl_pack_grid_position_get(gd, ev->object, &x, &y, &w, &h);
93 efl_pack_grid(gd, ev->object, x - 1, y - 1, w + 2, h + 2); 92 efl_pack_grid(gd, ev->object, x - 1, y - 1, w + 2, h + 2);
94 return 1;
95} 93}
96 94
97static Eina_Bool 95static void
98_win_del(void *data, const Eo_Event *ev EINA_UNUSED) 96_win_del(void *data, const Eo_Event *ev EINA_UNUSED)
99{ 97{
100 free(data); 98 free(data);
101 return 1;
102} 99}
103 100
104void 101void
diff --git a/src/bin/elementary/test_task_switcher.c b/src/bin/elementary/test_task_switcher.c
index 8133b7f..09380a1 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
33 elm_app_client_view_resume(view, NULL, NULL); 33 elm_app_client_view_resume(view, NULL, NULL);
34} 34}
35 35
36static Eina_Bool 36static void
37_app_view_prop_changed_cb(void *data EINA_UNUSED, const Eo_Event *event) 37_app_view_prop_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
38{ 38{
39 Elm_App_View_State state = ELM_APP_VIEW_STATE_UNKNOWN; 39 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)
48 } 48 }
49 else 49 else
50 _app_view_clicked(event->object, NULL, NULL); 50 _app_view_clicked(event->object, NULL, NULL);
51
52 return EINA_TRUE;
53} 51}
54 52
55static void 53static void
@@ -270,12 +268,11 @@ _app_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
270 elm_list_go(views); 268 elm_list_go(views);
271} 269}
272 270
273static Eina_Bool 271static void
274_view_list_update_cb(void *data EINA_UNUSED, const Eo_Event *event) 272_view_list_update_cb(void *data EINA_UNUSED, const Eo_Event *event)
275{ 273{
276 if (app_selected == event->object) 274 if (app_selected == event->object)
277 _app_clicked(event->object, NULL, NULL); 275 _app_clicked(event->object, NULL, NULL);
278 return EINA_TRUE;
279} 276}
280 277
281static void 278static void
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index bee7433..7c83b4a 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -18,7 +18,7 @@ typedef enum {
18 TWO 18 TWO
19} Weight_Mode; 19} Weight_Mode;
20 20
21static Eina_Bool 21static void
22weights_cb(void *data, const Eo_Event *event) 22weights_cb(void *data, const Eo_Event *event)
23{ 23{
24 Weight_Mode mode = elm_radio_state_value_get(event->object); 24 Weight_Mode mode = elm_radio_state_value_get(event->object);
@@ -58,92 +58,81 @@ weights_cb(void *data, const Eo_Event *event)
58 efl_gfx_size_hint_weight_set(objects[i], 0, 0); 58 efl_gfx_size_hint_weight_set(objects[i], 0, 0);
59 break; 59 break;
60 } 60 }
61
62 return EO_CALLBACK_CONTINUE;
63} 61}
64 62
65static Eina_Bool 63static void
66user_min_slider_cb(void *data EINA_UNUSED, const Eo_Event *event) 64user_min_slider_cb(void *data EINA_UNUSED, const Eo_Event *event)
67{ 65{
68 int val = elm_slider_value_get(event->object); 66 int val = elm_slider_value_get(event->object);
69 efl_gfx_size_hint_min_set(objects[3], val, val); 67 efl_gfx_size_hint_min_set(objects[3], val, val);
70 return EO_CALLBACK_CONTINUE;
71} 68}
72 69
73static Eina_Bool 70static void
74padding_slider_cb(void *data, const Eo_Event *event) 71padding_slider_cb(void *data, const Eo_Event *event)
75{ 72{
76 int val = elm_slider_value_get(event->object); 73 int val = elm_slider_value_get(event->object);
77 efl_pack_padding_set(data, val, val, EINA_TRUE); 74 efl_pack_padding_set(data, val, val, EINA_TRUE);
78 return EO_CALLBACK_CONTINUE;
79} 75}
80 76
81static Eina_Bool 77static void
82margin_slider_cb(void *data, const Eo_Event *event) 78margin_slider_cb(void *data, const Eo_Event *event)
83{ 79{
84 int val = elm_slider_value_get(event->object); 80 int val = elm_slider_value_get(event->object);
85 efl_gfx_size_hint_margin_set(data, val, val, val, val); 81 efl_gfx_size_hint_margin_set(data, val, val, val, val);
86 return EO_CALLBACK_CONTINUE;
87} 82}
88 83
89static Eina_Bool 84static void
90alignh_slider_cb(void *data, const Eo_Event *event) 85alignh_slider_cb(void *data, const Eo_Event *event)
91{ 86{
92 double av, val; 87 double av, val;
93 val = elm_slider_value_get(event->object); 88 val = elm_slider_value_get(event->object);
94 efl_pack_align_get(data, NULL, &av); 89 efl_pack_align_get(data, NULL, &av);
95 efl_pack_align_set(data, val, av); 90 efl_pack_align_set(data, val, av);
96 return EO_CALLBACK_CONTINUE;
97} 91}
98 92
99static Eina_Bool 93static void
100alignv_slider_cb(void *data, const Eo_Event *event) 94alignv_slider_cb(void *data, const Eo_Event *event)
101{ 95{
102 double ah, val; 96 double ah, val;
103 val = elm_slider_value_get(event->object); 97 val = elm_slider_value_get(event->object);
104 efl_pack_align_get(data, &ah, NULL); 98 efl_pack_align_get(data, &ah, NULL);
105 efl_pack_align_set(data, ah, val); 99 efl_pack_align_set(data, ah, val);
106 return EO_CALLBACK_CONTINUE;
107} 100}
108 101
109static Efl_Ui_Box_Flow_Params s_flow_params = { 0, 0 }; 102static Efl_Ui_Box_Flow_Params s_flow_params = { 0, 0 };
110static Eina_Bool flow = EINA_FALSE; 103static Eina_Bool flow = EINA_FALSE;
111 104
112static Eina_Bool 105static void
113flow_check_cb(void *data, const Eo_Event *event) 106flow_check_cb(void *data, const Eo_Event *event)
114{ 107{
115 flow = elm_check_selected_get(event->object); 108 flow = elm_check_selected_get(event->object);
116 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params); 109 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params);
117 return EO_CALLBACK_CONTINUE;
118} 110}
119 111
120static Eina_Bool 112static void
121horiz_check_cb(void *data, const Eo_Event *event) 113horiz_check_cb(void *data, const Eo_Event *event)
122{ 114{
123 Eina_Bool chk = elm_check_selected_get(event->object); 115 Eina_Bool chk = elm_check_selected_get(event->object);
124 efl_orientation_set(data, chk ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL); 116 efl_orientation_set(data, chk ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL);
125 return EO_CALLBACK_CONTINUE;
126} 117}
127 118
128static Eina_Bool 119static void
129homo_check_cb(void *data, const Eo_Event *event) 120homo_check_cb(void *data, const Eo_Event *event)
130{ 121{
131 Eina_Bool chk = elm_check_selected_get(event->object); 122 Eina_Bool chk = elm_check_selected_get(event->object);
132 s_flow_params.homogenous = chk; 123 s_flow_params.homogenous = chk;
133 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params); 124 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params);
134 return EO_CALLBACK_CONTINUE;
135} 125}
136 126
137static Eina_Bool 127static void
138max_size_check_cb(void *data, const Eo_Event *event) 128max_size_check_cb(void *data, const Eo_Event *event)
139{ 129{
140 Eina_Bool chk = elm_check_selected_get(event->object); 130 Eina_Bool chk = elm_check_selected_get(event->object);
141 s_flow_params.max_size = chk; 131 s_flow_params.max_size = chk;
142 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params); 132 efl_pack_layout_engine_set(data, flow ? EFL_UI_BOX_FLOW_CLASS : NULL, &s_flow_params);
143 return EO_CALLBACK_CONTINUE;
144} 133}
145 134
146static Eina_Bool 135static void
147left_check_cb(void *data, const Eo_Event *event) 136left_check_cb(void *data, const Eo_Event *event)
148{ 137{
149 Eina_Bool chk = elm_check_selected_get(event->object); 138 Eina_Bool chk = elm_check_selected_get(event->object);
@@ -155,7 +144,6 @@ left_check_cb(void *data, const Eo_Event *event)
155 { 144 {
156 efl_pack_align_set(data, 0.5, 0.5); 145 efl_pack_align_set(data, 0.5, 0.5);
157 } 146 }
158 return EO_CALLBACK_CONTINUE;
159} 147}
160 148
161static void 149static void
@@ -197,12 +185,11 @@ static const Eo_Class_Description custom_engine_class_desc = {
197 185
198EO_DEFINE_CLASS(_test_ui_box_custom_engine_class_get, &custom_engine_class_desc, EFL_PACK_LAYOUT_INTERFACE, NULL) 186EO_DEFINE_CLASS(_test_ui_box_custom_engine_class_get, &custom_engine_class_desc, EFL_PACK_LAYOUT_INTERFACE, NULL)
199 187
200static Eina_Bool 188static void
201custom_check_cb(void *data, const Eo_Event *event) 189custom_check_cb(void *data, const Eo_Event *event)
202{ 190{
203 Eina_Bool chk = elm_check_selected_get(event->object); 191 Eina_Bool chk = elm_check_selected_get(event->object);
204 efl_pack_layout_engine_set(data, chk ? _test_ui_box_custom_engine_class_get() : NULL, NULL); 192 efl_pack_layout_engine_set(data, chk ? _test_ui_box_custom_engine_class_get() : NULL, NULL);
205 return EO_CALLBACK_CONTINUE;
206} 193}
207 194
208void 195void
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 99e263d..55a2d79 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
32 32
33#define CUSTOM_ENGINE_CLASS _test_ui_grid_custom_engine_class_get() 33#define CUSTOM_ENGINE_CLASS _test_ui_grid_custom_engine_class_get()
34 34
35static Eina_Bool 35static void
36weights_cb(void *data, const Eo_Event *event) 36weights_cb(void *data, const Eo_Event *event)
37{ 37{
38 Weight_Mode mode = elm_radio_state_value_get(event->object); 38 Weight_Mode mode = elm_radio_state_value_get(event->object);
@@ -75,45 +75,39 @@ weights_cb(void *data, const Eo_Event *event)
75 efl_pack_layout_engine_set(grid, CUSTOM_ENGINE_CLASS, NULL); 75 efl_pack_layout_engine_set(grid, CUSTOM_ENGINE_CLASS, NULL);
76 break; 76 break;
77 } 77 }
78
79 return EO_CALLBACK_CONTINUE;
80} 78}
81 79
82static Eina_Bool 80static void
83user_min_slider_cb(void *data EINA_UNUSED, const Eo_Event *event) 81user_min_slider_cb(void *data EINA_UNUSED, const Eo_Event *event)
84{ 82{
85 int val = elm_slider_value_get(event->object); 83 int val = elm_slider_value_get(event->object);
86 for (int i = 0; i < 6; i++) 84 for (int i = 0; i < 6; i++)
87 efl_gfx_size_hint_min_set(objects[i], val, val); 85 efl_gfx_size_hint_min_set(objects[i], val, val);
88 return EO_CALLBACK_CONTINUE;
89} 86}
90 87
91static Eina_Bool 88static void
92padding_slider_cb(void *data, const Eo_Event *event) 89padding_slider_cb(void *data, const Eo_Event *event)
93{ 90{
94 int val = elm_slider_value_get(event->object); 91 int val = elm_slider_value_get(event->object);
95 efl_pack_padding_set(data, val, val, EINA_TRUE); 92 efl_pack_padding_set(data, val, val, EINA_TRUE);
96 return EO_CALLBACK_CONTINUE;
97} 93}
98 94
99static Eina_Bool 95static void
100margin_slider_cb(void *data, const Eo_Event *event) 96margin_slider_cb(void *data, const Eo_Event *event)
101{ 97{
102 int val = elm_slider_value_get(event->object); 98 int val = elm_slider_value_get(event->object);
103 efl_gfx_size_hint_margin_set(data, val, val, val, val); 99 efl_gfx_size_hint_margin_set(data, val, val, val, val);
104 return EO_CALLBACK_CONTINUE;
105} 100}
106 101
107static Eina_Bool 102static void
108btnmargins_slider_cb(void *data, const Eo_Event *event) 103btnmargins_slider_cb(void *data, const Eo_Event *event)
109{ 104{
110 int val = elm_slider_value_get(event->object); 105 int val = elm_slider_value_get(event->object);
111 for (int i = 1; i < 7; i++) 106 for (int i = 1; i < 7; i++)
112 efl_gfx_size_hint_margin_set(data, val, val, val, val); 107 efl_gfx_size_hint_margin_set(data, val, val, val, val);
113 return EO_CALLBACK_CONTINUE;
114} 108}
115 109
116static Eina_Bool 110static void
117layout_updated_cb(void *data, const Eo_Event *event) 111layout_updated_cb(void *data, const Eo_Event *event)
118{ 112{
119 Elm_Label *o = data; 113 Elm_Label *o = data;
@@ -124,11 +118,9 @@ layout_updated_cb(void *data, const Eo_Event *event)
124 count = efl_content_count(event->object); 118 count = efl_content_count(event->object);
125 sprintf(buf, "%d items (%dx%d)", count, cols, rows); 119 sprintf(buf, "%d items (%dx%d)", count, cols, rows);
126 elm_object_text_set(o, buf); 120 elm_object_text_set(o, buf);
127
128 return EO_CALLBACK_CONTINUE;
129} 121}
130 122
131static Eina_Bool 123static void
132child_evt_cb(void *data, const Eo_Event *event) 124child_evt_cb(void *data, const Eo_Event *event)
133{ 125{
134 Elm_Label *o = data; 126 Elm_Label *o = data;
@@ -142,8 +134,6 @@ child_evt_cb(void *data, const Eo_Event *event)
142 else 134 else
143 sprintf(buf, "unpack %d,%d %dx%d", col, row, colspan, rowspan); 135 sprintf(buf, "unpack %d,%d %dx%d", col, row, colspan, rowspan);
144 elm_object_text_set(o, buf); 136 elm_object_text_set(o, buf);
145
146 return EO_CALLBACK_CONTINUE;
147} 137}
148 138
149static void 139static void
@@ -498,14 +488,13 @@ btn_text(const char *str)
498 return buf; 488 return buf;
499} 489}
500 490
501static Eina_Bool 491static void
502remove_cb(void *data EINA_UNUSED, const Eo_Event *ev) 492remove_cb(void *data EINA_UNUSED, const Eo_Event *ev)
503{ 493{
504 eo_del(ev->object); 494 eo_del(ev->object);
505 return 1;
506} 495}
507 496
508static Eina_Bool 497static void
509append_cb(void *data, const Eo_Event *ev EINA_UNUSED) 498append_cb(void *data, const Eo_Event *ev EINA_UNUSED)
510{ 499{
511 Eo *grid = data; 500 Eo *grid = data;
@@ -515,15 +504,13 @@ append_cb(void *data, const Eo_Event *ev EINA_UNUSED)
515 elm_object_tooltip_text_set(o, "Click to unpack"); 504 elm_object_tooltip_text_set(o, "Click to unpack");
516 efl_pack_end(grid, o); 505 efl_pack_end(grid, o);
517 efl_gfx_visible_set(o, 1); 506 efl_gfx_visible_set(o, 1);
518 return 1;
519} 507}
520 508
521static Eina_Bool 509static void
522clear_cb(void *data, const Eo_Event *ev EINA_UNUSED) 510clear_cb(void *data, const Eo_Event *ev EINA_UNUSED)
523{ 511{
524 Eo *grid = data; 512 Eo *grid = data;
525 efl_pack_clear(grid); 513 efl_pack_clear(grid);
526 return 1;
527} 514}
528 515
529void 516void
diff --git a/src/bin/elementary/test_win_plug.c b/src/bin/elementary/test_win_plug.c
index 2794bb3..4f28f24 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)
143 } 143 }
144} 144}
145 145
146static Eina_Bool 146static void
147_notify_end(void *data EINA_UNUSED, const Eo_Event *event) 147_notify_end(void *data EINA_UNUSED, const Eo_Event *event)
148{ 148{
149 eo_del(event->object); 149 eo_del(event->object);
150 return EINA_FALSE; 150 eo_event_callback_stop(event->object);
151} 151}
152 152
153static inline void 153static inline void
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index 29be761..0b1ea08 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)
191 return EINA_TRUE; 191 return EINA_TRUE;
192} 192}
193 193
194static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event) 194static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
195{ 195{
196 const char *name; 196 const char *name;
197 Eina_Bool ret; 197 Eina_Bool ret;
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index a9451ea..2e1e92c 100644
--- a/src/examples/ecore/ecore_audio_to_ogg.c
+++ b/src/examples/ecore/ecore_audio_to_ogg.c
@@ -15,7 +15,7 @@
15double volume = 1; 15double volume = 1;
16Eina_List *inputs = NULL; 16Eina_List *inputs = NULL;
17 17
18static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event) 18static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
19{ 19{
20 const char *name; 20 const char *name;
21 Eo *out; 21 Eo *out;
diff --git a/src/examples/eio/eio_sentry.c b/src/examples/eio/eio_sentry.c
index f48ee46..2952902 100644
--- a/src/examples/eio/eio_sentry.c
+++ b/src/examples/eio/eio_sentry.c
@@ -10,7 +10,7 @@
10#include <Eio.h> 10#include <Eio.h>
11#include <Ecore.h> 11#include <Ecore.h>
12 12
13Eina_Bool 13void
14sentry_cb(void *data EINA_UNUSED, const Eo_Event *event) 14sentry_cb(void *data EINA_UNUSED, const Eo_Event *event)
15{ 15{
16 Eio_Sentry_Event *event_info = event->info; 16 Eio_Sentry_Event *event_info = event->info;
@@ -20,7 +20,7 @@ sentry_cb(void *data EINA_UNUSED, const Eo_Event *event)
20 20
21 ecore_main_loop_quit(); 21 ecore_main_loop_quit();
22 22
23 return EINA_FALSE; 23 eo_event_callback_stop(event->object);
24} 24}
25 25
26void 26void
diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c
index f4d7890..0995021 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
46 return EINA_FALSE; 46 return EINA_FALSE;
47} 47}
48 48
49static Eina_Bool 49static void
50_list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event) 50_list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event)
51{ 51{
52 Efl_Model_Test_Filemvc_Data *priv = data; 52 Efl_Model_Test_Filemvc_Data *priv = data;
@@ -55,7 +55,6 @@ _list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event)
55 55
56 printf("LIST selected model\n"); 56 printf("LIST selected model\n");
57 elm_view_form_model_set(priv->formview, child); 57 elm_view_form_model_set(priv->formview, child);
58 return EINA_TRUE;
59} 58}
60 59
61static void 60static void
@@ -75,7 +74,7 @@ _promise_error(void *data, const Eina_Error err)
75{ 74{
76} 75}
77 76
78static Eina_Bool 77static void
79_tree_selected_cb(void *data, const Eo_Event *event) 78_tree_selected_cb(void *data, const Eo_Event *event)
80{ 79{
81 Efl_Model_Test_Filemvc_Data *priv = data; 80 Efl_Model_Test_Filemvc_Data *priv = data;
@@ -86,7 +85,6 @@ _tree_selected_cb(void *data, const Eo_Event *event)
86 85
87 promise= efl_model_property_get(child, "path"); 86 promise= efl_model_property_get(child, "path");
88 eina_promise_then(promise, &_promise_then, &_promise_error, priv); 87 eina_promise_then(promise, &_promise_then, &_promise_error, priv);
89 return EINA_TRUE;
90} 88}
91 89
92static void 90static void
diff --git a/src/examples/emotion/emotion_basic_example.c b/src/examples/emotion/emotion_basic_example.c
index 7b6ce43..7f14486 100644
--- a/src/examples/emotion/emotion_basic_example.c
+++ b/src/examples/emotion/emotion_basic_example.c
@@ -14,12 +14,10 @@
14#define WIDTH (320) 14#define WIDTH (320)
15#define HEIGHT (240) 15#define HEIGHT (240)
16 16
17static Eina_Bool 17static void
18_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) 18_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED)
19{ 19{
20 printf("Emotion object started playback.\n"); 20 printf("Emotion object started playback.\n");
21
22 return EINA_TRUE;
23} 21}
24 22
25int 23int
diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c
index 67c43a9..e106a11 100644
--- a/src/examples/emotion/emotion_border_example.c
+++ b/src/examples/emotion/emotion_border_example.c
@@ -17,12 +17,10 @@
17static Eina_List *filenames = NULL; 17static Eina_List *filenames = NULL;
18static Eina_List *curfile = NULL; 18static Eina_List *curfile = NULL;
19 19
20static Eina_Bool 20static void
21_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) 21_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED)
22{ 22{
23 printf("Emotion object started playback.\n"); 23 printf("Emotion object started playback.\n");
24
25 return EINA_TRUE;
26} 24}
27 25
28static Evas_Object * 26static Evas_Object *
@@ -107,48 +105,38 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *
107 } 105 }
108} 106}
109 107
110static Eina_Bool 108static void
111_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) 109_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED)
112{ 110{
113 // fprintf(stderr, "smartcb: frame_decode\n"); 111 // fprintf(stderr, "smartcb: frame_decode\n");
114
115 return EINA_TRUE;
116} 112}
117 113
118static Eina_Bool 114static void
119_length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) 115_length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev)
120{ 116{
121 fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object)); 117 fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object));
122
123 return EINA_TRUE;
124} 118}
125 119
126static Eina_Bool 120static void
127_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) 121_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
128{ 122{
129 fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object)); 123 fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object));
130
131 return EINA_TRUE;
132} 124}
133 125
134static Eina_Bool 126static void
135_progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) 127_progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev)
136{ 128{
137 fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n", 129 fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n",
138 emotion_object_progress_status_get(ev->object), 130 emotion_object_progress_status_get(ev->object),
139 emotion_object_progress_info_get(ev->object)); 131 emotion_object_progress_info_get(ev->object));
140
141 return EINA_TRUE;
142} 132}
143 133
144static Eina_Bool 134static void
145_frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev) 135_frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev)
146{ 136{
147 int w, h; 137 int w, h;
148 emotion_object_size_get(ev->object, &w, &h); 138 emotion_object_size_get(ev->object, &w, &h);
149 fprintf(stderr, "smartcb: frame_resize: %dx%d\n", w, h); 139 fprintf(stderr, "smartcb: frame_resize: %dx%d\n", w, h);
150
151 return EINA_TRUE;
152} 140}
153 141
154static void /* adjust canvas' contents on resizes */ 142static 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 f0d7fab..f7afeba 100644
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -18,22 +18,18 @@
18static Eina_List *filenames = NULL; 18static Eina_List *filenames = NULL;
19static Eina_List *curfile = NULL; 19static Eina_List *curfile = NULL;
20 20
21static Eina_Bool 21static void
22_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) 22_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED)
23{ 23{
24 printf("Emotion object started playback.\n"); 24 printf("Emotion object started playback.\n");
25
26 return EINA_TRUE;
27} 25}
28 26
29static Eina_Bool 27static void
30_playback_stopped_cb(void *data EINA_UNUSED, const Eo_Event *ev) 28_playback_stopped_cb(void *data EINA_UNUSED, const Eo_Event *ev)
31{ 29{
32 printf("Emotion playback stopped.\n"); 30 printf("Emotion playback stopped.\n");
33 emotion_object_play_set(ev->object, EINA_FALSE); 31 emotion_object_play_set(ev->object, EINA_FALSE);
34 emotion_object_position_set(ev->object, 0); 32 emotion_object_position_set(ev->object, 0);
35
36 return EINA_TRUE;
37} 33}
38 34
39static Evas_Object * 35static Evas_Object *
@@ -130,38 +126,30 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *
130 } 126 }
131} 127}
132 128
133static Eina_Bool 129static void
134_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) 130_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED)
135{ 131{
136 // fprintf(stderr, "smartcb: frame_decode\n"); 132 // fprintf(stderr, "smartcb: frame_decode\n");
137
138 return EINA_TRUE;
139} 133}
140 134
141static Eina_Bool 135static void
142_length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) 136_length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev)
143{ 137{
144 fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object)); 138 fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object));
145
146 return EINA_TRUE;
147} 139}
148 140
149static Eina_Bool 141static void
150_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) 142_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
151{ 143{
152 fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object)); 144 fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object));
153
154 return EINA_TRUE;
155} 145}
156 146
157static Eina_Bool 147static void
158_progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev) 148_progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev)
159{ 149{
160 fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n", 150 fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n",
161 emotion_object_progress_status_get(ev->object), 151 emotion_object_progress_status_get(ev->object),
162 emotion_object_progress_info_get(ev->object)); 152 emotion_object_progress_info_get(ev->object));
163
164 return EINA_TRUE;
165} 153}
166 154
167EO_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks, 155EO_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 5246916..8bfa151 100644
--- a/src/examples/emotion/emotion_generic_subtitle_example.c
+++ b/src/examples/emotion/emotion_generic_subtitle_example.c
@@ -13,12 +13,10 @@
13#define WIDTH (320) 13#define WIDTH (320)
14#define HEIGHT (240) 14#define HEIGHT (240)
15 15
16static Eina_Bool 16static void
17_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED) 17_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED)
18{ 18{
19 printf("Emotion object started playback.\n"); 19 printf("Emotion object started playback.\n");
20
21 return EINA_TRUE;
22} 20}
23 21
24static void 22static void
diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c
index ecf30a7..aae1063 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)
33 printf("\n"); 33 printf("\n");
34} 34}
35 35
36static Eina_Bool 36static void
37_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev) 37_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev)
38{ 38{
39 printf(">>> Emotion object started playback.\n"); 39 printf(">>> Emotion object started playback.\n");
40 _display_info(ev->object); 40 _display_info(ev->object);
41
42 return EINA_TRUE;
43} 41}
44 42
45static Eina_Bool 43static void
46_playback_finished_cb(void *data EINA_UNUSED, const Eo_Event *ev) 44_playback_finished_cb(void *data EINA_UNUSED, const Eo_Event *ev)
47{ 45{
48 printf(">>> Emotion object finished playback.\n"); 46 printf(">>> Emotion object finished playback.\n");
49 _display_info(ev->object); 47 _display_info(ev->object);
50
51 return EINA_TRUE;
52} 48}
53 49
54static Eina_Bool 50static void
55_open_done_cb(void *data EINA_UNUSED, const Eo_Event *ev) 51_open_done_cb(void *data EINA_UNUSED, const Eo_Event *ev)
56{ 52{
57 printf(">>> Emotion object open done.\n"); 53 printf(">>> Emotion object open done.\n");
58 _display_info(ev->object); 54 _display_info(ev->object);
59
60 return EINA_TRUE;
61} 55}
62 56
63static Eina_Bool 57static void
64_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev) 58_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
65{ 59{
66 printf(">>> Emotion object first position update.\n"); 60 printf(">>> Emotion object first position update.\n");
67 eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL); 61 eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL);
68 _display_info(ev->object); 62 _display_info(ev->object);
69
70 return EINA_TRUE;
71} 63}
72 64
73static Eina_Bool 65static void
74_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev) 66_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev)
75{ 67{
76 printf(">>> Emotion object first frame decode.\n"); 68 printf(">>> Emotion object first frame decode.\n");
77 eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL); 69 eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL);
78 _display_info(ev->object); 70 _display_info(ev->object);
79
80 return EINA_TRUE;
81} 71}
82 72
83static Eina_Bool 73static void
84_decode_stop_cb(void *data EINA_UNUSED, const Eo_Event *ev) 74_decode_stop_cb(void *data EINA_UNUSED, const Eo_Event *ev)
85{ 75{
86 printf(">>> Emotion object decode stop.\n"); 76 printf(">>> Emotion object decode stop.\n");
87 _display_info(ev->object); 77 _display_info(ev->object);
88
89 return EINA_TRUE;
90} 78}
91 79
92static Eina_Bool 80static void
93_frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev) 81_frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev)
94{ 82{
95 printf(">>> Emotion object frame resize.\n"); 83 printf(">>> Emotion object frame resize.\n");
96 _display_info(ev->object); 84 _display_info(ev->object);
97
98 return EINA_TRUE;
99} 85}
100 86
101static void 87static void
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 67b0221..e7782f0 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
88 Eina_Bool init; 88 Eina_Bool init;
89} Scene_Data; 89} Scene_Data;
90 90
91Eina_Bool 91void
92_cb_clicked(void *data EINA_UNUSED, const Eo_Event *event) 92_cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
93{ 93{
94 Eina_List *meshes = NULL, *l; 94 Eina_List *meshes = NULL, *l;
@@ -112,11 +112,9 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
112 } 112 }
113 choosed_node = (Evas_Canvas3D_Node *)event->info; 113 choosed_node = (Evas_Canvas3D_Node *)event->info;
114 } 114 }
115
116 return EINA_TRUE;
117} 115}
118 116
119Eina_Bool 117void
120_cb_collision(void *data EINA_UNUSED, const Eo_Event *event) 118_cb_collision(void *data EINA_UNUSED, const Eo_Event *event)
121{ 119{
122 Eina_List *meshes = NULL, *l; 120 Eina_List *meshes = NULL, *l;
@@ -126,8 +124,6 @@ _cb_collision(void *data EINA_UNUSED, const Eo_Event *event)
126 { 124 {
127 evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE); 125 evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
128 } 126 }
129
130 return EINA_TRUE;
131} 127}
132 128
133static void 129static void
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index f0d6cd7..1512af3 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -20,15 +20,13 @@ struct _Ecore_Factorized_Idle
20 Eina_Bool delete_me : 1; 20 Eina_Bool delete_me : 1;
21}; 21};
22 22
23Eina_Bool 23void
24_ecore_factorized_idle_event_del(void *data, const Eo_Event *event EINA_UNUSED) 24_ecore_factorized_idle_event_del(void *data, const Eo_Event *event EINA_UNUSED)
25{ 25{
26 _ecore_factorized_idle_del(data); 26 _ecore_factorized_idle_del(data);
27
28 return EO_CALLBACK_CONTINUE;
29} 27}
30 28
31Eina_Bool 29void
32_ecore_factorized_idle_process(void *data, const Eo_Event *event EINA_UNUSED) 30_ecore_factorized_idle_process(void *data, const Eo_Event *event EINA_UNUSED)
33{ 31{
34 Ecore_Factorized_Idle *idler = data; 32 Ecore_Factorized_Idle *idler = data;
@@ -41,8 +39,6 @@ _ecore_factorized_idle_process(void *data, const Eo_Event *event EINA_UNUSED)
41 if (idler->delete_me && 39 if (idler->delete_me &&
42 idler->references == 0) 40 idler->references == 0)
43 _ecore_factorized_idle_del(idler); 41 _ecore_factorized_idle_del(idler);
44
45 return EO_CALLBACK_CONTINUE;
46} 42}
47 43
48void * 44void *
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 0ee0eb6..7bab6e6 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
2753 return eo_provider_find(eo_super(obj, EFL_LOOP_CLASS), klass); 2753 return eo_provider_find(eo_super(obj, EFL_LOOP_CLASS), klass);
2754} 2754}
2755 2755
2756static Eina_Bool 2756static void
2757_check_event_catcher_add(void *data, const Eo_Event *event) 2757_check_event_catcher_add(void *data, const Eo_Event *event)
2758{ 2758{
2759 const Eo_Callback_Array_Item *array = event->info; 2759 const Eo_Callback_Array_Item *array = event->info;
@@ -2767,11 +2767,9 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
2767 ++pd->idlers; 2767 ++pd->idlers;
2768 } 2768 }
2769 } 2769 }
2770
2771 return EO_CALLBACK_CONTINUE;
2772} 2770}
2773 2771
2774static Eina_Bool 2772static void
2775_check_event_catcher_del(void *data, const Eo_Event *event) 2773_check_event_catcher_del(void *data, const Eo_Event *event)
2776{ 2774{
2777 const Eo_Callback_Array_Item *array = event->info; 2775 const Eo_Callback_Array_Item *array = event->info;
@@ -2785,8 +2783,6 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
2785 --pd->idlers; 2783 --pd->idlers;
2786 } 2784 }
2787 } 2785 }
2788
2789 return EO_CALLBACK_CONTINUE;
2790} 2786}
2791 2787
2792EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch, 2788EO_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
2848 eina_promise_then(job, _efl_loop_args_job_cb, NULL, args); 2844 eina_promise_then(job, _efl_loop_args_job_cb, NULL, args);
2849} 2845}
2850 2846
2851static Eina_Bool _efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED); 2847static void _efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED);
2852static Eina_Bool _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED); 2848static void _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED);
2853 2849
2854EO_CALLBACKS_ARRAY_DEFINE(timeout, 2850EO_CALLBACKS_ARRAY_DEFINE(timeout,
2855 { EFL_LOOP_TIMER_EVENT_TICK, _efl_loop_timeout_cb }, 2851 { EFL_LOOP_TIMER_EVENT_TICK, _efl_loop_timeout_cb },
@@ -2858,15 +2854,13 @@ EO_CALLBACKS_ARRAY_DEFINE(timeout,
2858/* This event will be triggered when the main loop is destroyed and destroy its timers along */ 2854/* This event will be triggered when the main loop is destroyed and destroy its timers along */
2859static void _efl_loop_internal_cancel(Efl_Internal_Promise *p); 2855static void _efl_loop_internal_cancel(Efl_Internal_Promise *p);
2860 2856
2861static Eina_Bool 2857static void
2862_efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED) 2858_efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED)
2863{ 2859{
2864 _efl_loop_internal_cancel(data); 2860 _efl_loop_internal_cancel(data);
2865
2866 return EO_CALLBACK_CONTINUE;
2867} 2861}
2868 2862
2869static Eina_Bool 2863static void
2870_efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED) 2864_efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
2871{ 2865{
2872 Efl_Internal_Promise *t = data; 2866 Efl_Internal_Promise *t = data;
@@ -2875,8 +2869,6 @@ _efl_loop_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
2875 2869
2876 eo_event_callback_array_del(t->u.timer, timeout(), t); 2870 eo_event_callback_array_del(t->u.timer, timeout(), t);
2877 eo_del(t->u.timer); 2871 eo_del(t->u.timer);
2878
2879 return EO_CALLBACK_CONTINUE;
2880} 2872}
2881 2873
2882static void 2874static void
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index 1b4b355..172a43c 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
163 Ecore_Task_Cb func, 163 Ecore_Task_Cb func,
164 const void *data); 164 const void *data);
165void *_ecore_factorized_idle_del(Ecore_Idler *idler); 165void *_ecore_factorized_idle_del(Ecore_Idler *idler);
166Eina_Bool _ecore_factorized_idle_process(void *data, const Eo_Event *event); 166void _ecore_factorized_idle_process(void *data, const Eo_Event *event);
167Eina_Bool _ecore_factorized_idle_event_del(void *data, const Eo_Event *event); 167void _ecore_factorized_idle_event_del(void *data, const Eo_Event *event);
168 168
169void _ecore_idler_all_call(Eo *loop); 169void _ecore_idler_all_call(Eo *loop);
170int _ecore_idler_exist(Eo *loop); 170int _ecore_idler_exist(Eo *loop);
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index b7fce54..391c792 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)
74 precision = value; 74 precision = value;
75} 75}
76 76
77static Eina_Bool 77static void
78_check_timer_event_catcher_add(void *data, const Eo_Event *event) 78_check_timer_event_catcher_add(void *data, const Eo_Event *event)
79{ 79{
80 const Eo_Callback_Array_Item *array = event->info; 80 const Eo_Callback_Array_Item *array = event->info;
@@ -85,18 +85,16 @@ _check_timer_event_catcher_add(void *data, const Eo_Event *event)
85 { 85 {
86 if (array[i].desc == EFL_LOOP_TIMER_EVENT_TICK) 86 if (array[i].desc == EFL_LOOP_TIMER_EVENT_TICK)
87 { 87 {
88 if (timer->listening++ > 0) return EO_CALLBACK_CONTINUE; 88 if (timer->listening++ > 0) return;
89 _efl_loop_timer_util_instanciate(timer); 89 _efl_loop_timer_util_instanciate(timer);
90 // No need to walk more than once per array as you can not del 90 // No need to walk more than once per array as you can not del
91 // a partial array 91 // a partial array
92 return EO_CALLBACK_CONTINUE; 92 return;
93 } 93 }
94 } 94 }
95
96 return EO_CALLBACK_CONTINUE;
97} 95}
98 96
99static Eina_Bool 97static void
100_check_timer_event_catcher_del(void *data, const Eo_Event *event) 98_check_timer_event_catcher_del(void *data, const Eo_Event *event)
101{ 99{
102 const Eo_Callback_Array_Item *array = event->info; 100 const Eo_Callback_Array_Item *array = event->info;
@@ -107,13 +105,11 @@ _check_timer_event_catcher_del(void *data, const Eo_Event *event)
107 { 105 {
108 if (array[i].desc == EFL_LOOP_TIMER_EVENT_TICK) 106 if (array[i].desc == EFL_LOOP_TIMER_EVENT_TICK)
109 { 107 {
110 if ((--timer->listening) > 0) return EO_CALLBACK_CONTINUE; 108 if ((--timer->listening) > 0) return;
111 _efl_loop_timer_util_instanciate(timer); 109 _efl_loop_timer_util_instanciate(timer);
112 return EO_CALLBACK_CONTINUE; 110 return;
113 } 111 }
114 } 112 }
115
116 return EO_CALLBACK_CONTINUE;
117} 113}
118 114
119EO_CALLBACKS_ARRAY_DEFINE(timer_watch, 115EO_CALLBACKS_ARRAY_DEFINE(timer_watch,
@@ -155,17 +151,15 @@ struct _Ecore_Timer_Legacy
155 Eina_Bool delete_me : 1; 151 Eina_Bool delete_me : 1;
156}; 152};
157 153
158static Eina_Bool 154static void
159_ecore_timer_legacy_del(void *data, const Eo_Event *event EINA_UNUSED) 155_ecore_timer_legacy_del(void *data, const Eo_Event *event EINA_UNUSED)
160{ 156{
161 Ecore_Timer_Legacy *legacy = data; 157 Ecore_Timer_Legacy *legacy = data;
162 158
163 free(legacy); 159 free(legacy);
164
165 return EO_CALLBACK_CONTINUE;
166} 160}
167 161
168static Eina_Bool 162static void
169_ecore_timer_legacy_tick(void *data, const Eo_Event *event) 163_ecore_timer_legacy_tick(void *data, const Eo_Event *event)
170{ 164{
171 Ecore_Timer_Legacy *legacy = data; 165 Ecore_Timer_Legacy *legacy = data;
@@ -174,8 +168,6 @@ _ecore_timer_legacy_tick(void *data, const Eo_Event *event)
174 if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data) || 168 if (!_ecore_call_task_cb(legacy->func, (void*)legacy->data) ||
175 legacy->delete_me) 169 legacy->delete_me)
176 eo_del(event->object); 170 eo_del(event->object);
177
178 return EO_CALLBACK_CONTINUE;
179} 171}
180 172
181EO_CALLBACKS_ARRAY_DEFINE(legacy_timer, 173EO_CALLBACKS_ARRAY_DEFINE(legacy_timer,
diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c
index 80e7a18..fdd59b1 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)
92 return pd->file ? pd->fd : -1; 92 return pd->file ? pd->fd : -1;
93} 93}
94 94
95static Eina_Bool 95static void
96_check_fd_event_catcher_add(void *data, const Eo_Event *event) 96_check_fd_event_catcher_add(void *data, const Eo_Event *event)
97{ 97{
98 const Eo_Callback_Array_Item *array = event->info; 98 const Eo_Callback_Array_Item *array = event->info;
@@ -117,11 +117,9 @@ _check_fd_event_catcher_add(void *data, const Eo_Event *event)
117 _efl_loop_fd_reset(event->object, fd); 117 _efl_loop_fd_reset(event->object, fd);
118 } 118 }
119 } 119 }
120
121 return EO_CALLBACK_CONTINUE;
122} 120}
123 121
124static Eina_Bool 122static void
125_check_fd_event_catcher_del(void *data, const Eo_Event *event) 123_check_fd_event_catcher_del(void *data, const Eo_Event *event)
126{ 124{
127 const Eo_Callback_Array_Item *array = event->info; 125 const Eo_Callback_Array_Item *array = event->info;
@@ -146,8 +144,6 @@ _check_fd_event_catcher_del(void *data, const Eo_Event *event)
146 _efl_loop_fd_reset(event->object, fd); 144 _efl_loop_fd_reset(event->object, fd);
147 } 145 }
148 } 146 }
149
150 return EO_CALLBACK_CONTINUE;
151} 147}
152 148
153EO_CALLBACKS_ARRAY_DEFINE(fd_watch, 149EO_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 05c42b4..7c6db02 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)
88 } 88 }
89} 89}
90 90
91static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *event) 91static void _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *event)
92{ 92{
93 pa_stream *stream = NULL; 93 pa_stream *stream = NULL;
94 int samplerate = 0; 94 int samplerate = 0;
@@ -100,8 +100,6 @@ static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *e
100 stream = eo_key_data_get(event->object, "pulse_data"); 100 stream = eo_key_data_get(event->object, "pulse_data");
101 101
102 pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL)); 102 pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL));
103
104 return EINA_TRUE;
105} 103}
106 104
107static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in) 105static 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)
146 return ret; 144 return ret;
147} 145}
148 146
149static Eina_Bool _delayed_attach_cb(void *data, const Eo_Event *event) 147static void _delayed_attach_cb(void *data, const Eo_Event *event)
150{ 148{
151 Eo *in = data; 149 Eo *in = data;
152 eo_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in); 150 eo_event_callback_del(event->object, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in);
153 151
154 _input_attach_internal(event->object, in); 152 _input_attach_internal(event->object, in);
155
156 return EINA_TRUE;
157} 153}
158 154
159EOLIAN static Eina_Bool 155EOLIAN static Eina_Bool
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 3037d2c..df01406 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)
161 161
162extern Ecore_Con_Socks *_ecore_con_proxy_global; 162extern Ecore_Con_Socks *_ecore_con_proxy_global;
163 163
164static Eina_Bool 164static void
165_efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event) 165_efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event)
166{ 166{
167 Ecore_Con_Event_Url_Complete *e, *f = event->info; 167 Ecore_Con_Event_Url_Complete *e, *f = event->info;
168 168
169 e = calloc(1, sizeof(Ecore_Con_Event_Url_Complete)); 169 e = calloc(1, sizeof(Ecore_Con_Event_Url_Complete));
170 if (!e) return EO_CALLBACK_STOP; 170 if (!e)
171 {
172 eo_event_callback_stop(event->object);
173 return;
174 }
171 175
172 e->status = f->status; 176 e->status = f->status;
173 e->url_con = f->url_con; 177 e->url_con = f->url_con;
174 ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e, 178 ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e,
175 (Ecore_End_Cb)_ecore_con_event_url_free, event->object); 179 (Ecore_End_Cb)_ecore_con_event_url_free, event->object);
176 180
177 return EO_CALLBACK_STOP; 181 eo_event_callback_stop(event->object);
178} 182}
179 183
180static Eina_Bool 184static void
181_efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event) 185_efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event)
182{ 186{
183 Ecore_Con_Event_Url_Data *e; 187 Ecore_Con_Event_Url_Data *e;
@@ -185,24 +189,22 @@ _efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event)
185 189
186 e = malloc(sizeof(Ecore_Con_Event_Url_Data) + sizeof(unsigned char) * f->size); 190 e = malloc(sizeof(Ecore_Con_Event_Url_Data) + sizeof(unsigned char) * f->size);
187 191
188 if (!e) return EO_CALLBACK_CONTINUE; 192 if (!e) return;
189 193
190 e->url_con = f->url_con; 194 e->url_con = f->url_con;
191 e->size = f->size; 195 e->size = f->size;
192 memcpy(e->data, f->data, f->size); 196 memcpy(e->data, f->data, f->size);
193 ecore_event_add(ECORE_CON_EVENT_URL_DATA, e, 197 ecore_event_add(ECORE_CON_EVENT_URL_DATA, e,
194 (Ecore_End_Cb)_ecore_con_event_url_free, event->object); 198 (Ecore_End_Cb)_ecore_con_event_url_free, event->object);
195
196 return EO_CALLBACK_CONTINUE;
197} 199}
198 200
199static Eina_Bool 201static void
200_efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event) 202_efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event)
201{ 203{
202 Ecore_Con_Event_Url_Progress *e, *f = event->info; 204 Ecore_Con_Event_Url_Progress *e, *f = event->info;
203 205
204 e = malloc(sizeof(Ecore_Con_Event_Url_Progress)); 206 e = malloc(sizeof(Ecore_Con_Event_Url_Progress));
205 if (!e) return EO_CALLBACK_CONTINUE; 207 if (!e) return;
206 208
207 e->url_con = f->url_con; 209 e->url_con = f->url_con;
208 e->down.total = f->down.total; 210 e->down.total = f->down.total;
@@ -211,8 +213,6 @@ _efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event
211 e->up.now = f->up.now; 213 e->up.now = f->up.now;
212 ecore_event_add(ECORE_CON_EVENT_URL_PROGRESS, e, 214 ecore_event_add(ECORE_CON_EVENT_URL_PROGRESS, e,
213 (Ecore_End_Cb)_ecore_con_event_url_free, event->object); 215 (Ecore_End_Cb)_ecore_con_event_url_free, event->object);
214
215 return EO_CALLBACK_CONTINUE;
216} 216}
217 217
218EO_CALLBACKS_ARRAY_DEFINE(efl_network_url_event_table_callbacks, 218EO_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 01b01af..1a6bed5 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)
3161 return EINA_TRUE; 3161 return EINA_TRUE;
3162} 3162}
3163 3163
3164static Eina_Bool 3164static void
3165_check_animator_event_catcher_add(void *data, const Eo_Event *event) 3165_check_animator_event_catcher_add(void *data, const Eo_Event *event)
3166{ 3166{
3167 const Eo_Callback_Array_Item *array = event->info; 3167 const Eo_Callback_Array_Item *array = event->info;
@@ -3172,7 +3172,7 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event)
3172 { 3172 {
3173 if (array[i].desc == EFL_EVENT_ANIMATOR_TICK) 3173 if (array[i].desc == EFL_EVENT_ANIMATOR_TICK)
3174 { 3174 {
3175 if (ee->anim_count++ > 0) return EO_CALLBACK_CONTINUE; 3175 if (ee->anim_count++ > 0) return;
3176 INF("Setting up animator for %p from '%s' with title '%s'.", ee->evas, ee->driver, ee->prop.title); 3176 INF("Setting up animator for %p from '%s' with title '%s'.", ee->evas, ee->driver, ee->prop.title);
3177 3177
3178 if (ee->engine.func->fn_animator_register && 3178 if (ee->engine.func->fn_animator_register &&
@@ -3190,14 +3190,12 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event)
3190 3190
3191 // No need to walk more than once per array as you can not del 3191 // No need to walk more than once per array as you can not del
3192 // a partial array 3192 // a partial array
3193 return EO_CALLBACK_CONTINUE; 3193 return;
3194 } 3194 }
3195 } 3195 }
3196
3197 return EO_CALLBACK_CONTINUE;
3198} 3196}
3199 3197
3200static Eina_Bool 3198static void
3201_check_animator_event_catcher_del(void *data, const Eo_Event *event) 3199_check_animator_event_catcher_del(void *data, const Eo_Event *event)
3202{ 3200{
3203 const Eo_Callback_Array_Item *array = event->info; 3201 const Eo_Callback_Array_Item *array = event->info;
@@ -3208,7 +3206,7 @@ _check_animator_event_catcher_del(void *data, const Eo_Event *event)
3208 { 3206 {
3209 if (array[i].desc == EFL_EVENT_ANIMATOR_TICK) 3207 if (array[i].desc == EFL_EVENT_ANIMATOR_TICK)
3210 { 3208 {
3211 if ((--ee->anim_count) > 0) return EO_CALLBACK_CONTINUE; 3209 if ((--ee->anim_count) > 0) return;
3212 3210
3213 INF("Unsetting up animator for %p from '%s' titled '%s'.", ee->evas, ee->driver, ee->prop.title); 3211 INF("Unsetting up animator for %p from '%s' titled '%s'.", ee->evas, ee->driver, ee->prop.title);
3214 if (ee->engine.func->fn_animator_register && 3212 if (ee->engine.func->fn_animator_register &&
@@ -3224,11 +3222,9 @@ _check_animator_event_catcher_del(void *data, const Eo_Event *event)
3224 ecore_animator_del(ee->anim); 3222 ecore_animator_del(ee->anim);
3225 ee->anim = NULL; 3223 ee->anim = NULL;
3226 } 3224 }
3227 return EO_CALLBACK_CONTINUE; 3225 return;
3228 } 3226 }
3229 } 3227 }
3230
3231 return EO_CALLBACK_CONTINUE;
3232} 3228}
3233 3229
3234EO_CALLBACKS_ARRAY_DEFINE(animator_watch, 3230EO_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 ba423a2..811dc5c 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
75 cairo_path_t *path; 75 cairo_path_t *path;
76}; 76};
77 77
78static Eina_Bool 78static void
79_ector_renderer_cairo_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED) 79_ector_renderer_cairo_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED)
80{ 80{
81 Ector_Renderer_Cairo_Shape_Data *pd = data; 81 Ector_Renderer_Cairo_Shape_Data *pd = data;
82 82
83 if (pd->path) cairo_path_destroy(pd->path); 83 if (pd->path) cairo_path_destroy(pd->path);
84 pd->path = NULL; 84 pd->path = NULL;
85
86 return EINA_TRUE;
87} 85}
88 86
89static Eina_Bool 87static 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 b6bd8ef..7edc5e9 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
20 GLshort *vertex; 20 GLshort *vertex;
21}; 21};
22 22
23static Eina_Bool 23static void
24_ector_renderer_gl_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED) 24_ector_renderer_gl_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED)
25{ 25{
26 Ector_Renderer_GL_Shape_Data *pd = data; 26 Ector_Renderer_GL_Shape_Data *pd = data;
27 27
28 free(pd->vertex); 28 free(pd->vertex);
29 pd->vertex = NULL; 29 pd->vertex = NULL;
30
31 return EINA_TRUE;
32} 30}
33 31
34static Eina_Bool 32static 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 835e0ac..0a3f719 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,
679} 679}
680 680
681 681
682static Eina_Bool 682static void
683_ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED) 683_ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED)
684{ 684{
685 Ector_Renderer_Software_Shape_Data *pd = data; 685 Ector_Renderer_Software_Shape_Data *pd = data;
@@ -689,8 +689,6 @@ _ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EI
689 689
690 pd->shape_data = NULL; 690 pd->shape_data = NULL;
691 pd->outline_data = NULL; 691 pd->outline_data = NULL;
692
693 return EINA_TRUE;
694} 692}
695 693
696static Eo * 694static Eo *
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index f50af80..7afd37d 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -3,7 +3,7 @@
3#define EFL_INTERNAL_UNSTABLE 3#define EFL_INTERNAL_UNSTABLE
4#include "interfaces/efl_common_internal.h" 4#include "interfaces/efl_common_internal.h"
5 5
6static Eina_Bool 6static void
7_edje_hold_signal_cb(void *data, const Eo_Event *event) 7_edje_hold_signal_cb(void *data, const Eo_Event *event)
8{ 8{
9 Evas_Event_Hold *ev; 9 Evas_Event_Hold *ev;
@@ -13,16 +13,14 @@ _edje_hold_signal_cb(void *data, const Eo_Event *event)
13 ev = event->info; 13 ev = event->info;
14 ed = data; 14 ed = data;
15 rp = evas_object_data_get(event->object, "real_part"); 15 rp = evas_object_data_get(event->object, "real_part");
16 if (!rp) return EO_CALLBACK_CONTINUE; 16 if (!rp) return;
17 if (ev->hold) 17 if (ev->hold)
18 _edje_emit(ed, "hold,on", rp->part->name); 18 _edje_emit(ed, "hold,on", rp->part->name);
19 else 19 else
20 _edje_emit(ed, "hold,off", rp->part->name); 20 _edje_emit(ed, "hold,off", rp->part->name);
21
22 return EO_CALLBACK_CONTINUE;
23} 21}
24 22
25static Eina_Bool 23static void
26_edje_focus_in_signal_cb(void *data, const Eo_Event *event) 24_edje_focus_in_signal_cb(void *data, const Eo_Event *event)
27{ 25{
28 Edje *ed; 26 Edje *ed;
@@ -31,14 +29,12 @@ _edje_focus_in_signal_cb(void *data, const Eo_Event *event)
31 ed = data; 29 ed = data;
32 rp = evas_object_data_get(event->object, "real_part"); 30 rp = evas_object_data_get(event->object, "real_part");
33 if ((!rp) || (!ed)) 31 if ((!rp) || (!ed))
34 return EO_CALLBACK_CONTINUE; 32 return;
35 33
36 _edje_emit(ed, "focus,part,in", rp->part->name); 34 _edje_emit(ed, "focus,part,in", rp->part->name);
37
38 return EO_CALLBACK_CONTINUE;
39} 35}
40 36
41static Eina_Bool 37static void
42_edje_focus_out_signal_cb(void *data, const Eo_Event *event) 38_edje_focus_out_signal_cb(void *data, const Eo_Event *event)
43{ 39{
44 Edje *ed; 40 Edje *ed;
@@ -47,14 +43,12 @@ _edje_focus_out_signal_cb(void *data, const Eo_Event *event)
47 ed = data; 43 ed = data;
48 rp = evas_object_data_get(event->object, "real_part"); 44 rp = evas_object_data_get(event->object, "real_part");
49 if ((!rp) || (!ed)) 45 if ((!rp) || (!ed))
50 return EO_CALLBACK_CONTINUE; 46 return;
51 47
52 _edje_emit(ed, "focus,part,out", rp->part->name); 48 _edje_emit(ed, "focus,part,out", rp->part->name);
53
54 return EO_CALLBACK_CONTINUE;
55} 49}
56 50
57static Eina_Bool 51static void
58_edje_mouse_in_signal_cb(void *data, const Eo_Event *event) 52_edje_mouse_in_signal_cb(void *data, const Eo_Event *event)
59{ 53{
60 Efl_Event_Pointer_Data *ev; 54 Efl_Event_Pointer_Data *ev;
@@ -71,11 +65,9 @@ _edje_mouse_in_signal_cb(void *data, const Eo_Event *event)
71 65
72 ev->event_flags |= rp->part->mask_flags; 66 ev->event_flags |= rp->part->mask_flags;
73 } 67 }
74
75 return EO_CALLBACK_CONTINUE;
76} 68}
77 69
78static Eina_Bool 70static void
79_edje_mouse_out_signal_cb(void *data, const Eo_Event *event) 71_edje_mouse_out_signal_cb(void *data, const Eo_Event *event)
80{ 72{
81 Efl_Event_Pointer_Data *ev; 73 Efl_Event_Pointer_Data *ev;
@@ -92,11 +84,9 @@ _edje_mouse_out_signal_cb(void *data, const Eo_Event *event)
92 84
93 ev->event_flags |= rp->part->mask_flags; 85 ev->event_flags |= rp->part->mask_flags;
94 } 86 }
95
96 return EO_CALLBACK_CONTINUE;
97} 87}
98 88
99static Eina_Bool 89static void
100_edje_mouse_down_signal_cb(void *data, const Eo_Event *event) 90_edje_mouse_down_signal_cb(void *data, const Eo_Event *event)
101{ 91{
102 Efl_Event_Pointer_Data *ev; 92 Efl_Event_Pointer_Data *ev;
@@ -108,7 +98,7 @@ _edje_mouse_down_signal_cb(void *data, const Eo_Event *event)
108 ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); 98 ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
109 ed = data; 99 ed = data;
110 rp = evas_object_data_get(event->object, "real_part"); 100 rp = evas_object_data_get(event->object, "real_part");
111 if (!rp) return EO_CALLBACK_CONTINUE; 101 if (!rp) return;
112 102
113 ignored = rp->part->ignore_flags & ev->event_flags; 103 ignored = rp->part->ignore_flags & ev->event_flags;
114 104
@@ -163,11 +153,9 @@ _edje_mouse_down_signal_cb(void *data, const Eo_Event *event)
163 _edje_unref(ed); 153 _edje_unref(ed);
164 154
165 ev->event_flags |= rp->part->mask_flags; 155 ev->event_flags |= rp->part->mask_flags;
166
167 return EO_CALLBACK_CONTINUE;
168} 156}
169 157
170static Eina_Bool 158static void
171_edje_mouse_up_signal_cb(void *data, const Eo_Event *event) 159_edje_mouse_up_signal_cb(void *data, const Eo_Event *event)
172{ 160{
173 Efl_Event_Pointer_Data *ev; 161 Efl_Event_Pointer_Data *ev;
@@ -179,7 +167,7 @@ _edje_mouse_up_signal_cb(void *data, const Eo_Event *event)
179 ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); 167 ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
180 ed = data; 168 ed = data;
181 rp = evas_object_data_get(event->object, "real_part"); 169 rp = evas_object_data_get(event->object, "real_part");
182 if (!rp) return EO_CALLBACK_CONTINUE; 170 if (!rp) return;
183 171
184 ignored = rp->part->ignore_flags & ev->event_flags; 172 ignored = rp->part->ignore_flags & ev->event_flags;
185 173
@@ -238,11 +226,9 @@ _edje_mouse_up_signal_cb(void *data, const Eo_Event *event)
238 _edje_unref(ed); 226 _edje_unref(ed);
239 227
240 ev->event_flags |= rp->part->mask_flags; 228 ev->event_flags |= rp->part->mask_flags;
241
242 return EO_CALLBACK_CONTINUE;
243} 229}
244 230
245static Eina_Bool 231static void
246_edje_mouse_move_signal_cb(void *data, const Eo_Event *event) 232_edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
247{ 233{
248 Efl_Event_Pointer_Data *ev; 234 Efl_Event_Pointer_Data *ev;
@@ -253,7 +239,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
253 ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); 239 ev = eo_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS);
254 ed = data; 240 ed = data;
255 rp = evas_object_data_get(event->object, "real_part"); 241 rp = evas_object_data_get(event->object, "real_part");
256 if (!rp) return EO_CALLBACK_CONTINUE; 242 if (!rp) return;
257 if (rp->part->dragable.event_id >= 0) 243 if (rp->part->dragable.event_id >= 0)
258 { 244 {
259 rp = ed->table_parts[rp->part->dragable.event_id % ed->table_parts_size]; 245 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)
347 _edje_util_thaw(ed); 333 _edje_util_thaw(ed);
348 334
349 ev->event_flags |= rp->part->mask_flags; 335 ev->event_flags |= rp->part->mask_flags;
350
351 return EO_CALLBACK_CONTINUE;
352} 336}
353 337
354static Eina_Bool 338static void
355_edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event) 339_edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event)
356{ 340{
357 Efl_Event_Pointer_Data *ev; 341 Efl_Event_Pointer_Data *ev;
@@ -374,11 +358,9 @@ _edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event)
374 358
375 ev->event_flags |= rp->part->mask_flags; 359 ev->event_flags |= rp->part->mask_flags;
376 } 360 }
377
378 return EO_CALLBACK_CONTINUE;
379} 361}
380 362
381Eina_Bool 363void
382_edje_timer_cb(void *data, const Eo_Event *event EINA_UNUSED) 364_edje_timer_cb(void *data, const Eo_Event *event EINA_UNUSED)
383{ 365{
384 double t; 366 double t;
@@ -433,8 +415,6 @@ break_prog:
433 _edje_unblock(ed); 415 _edje_unblock(ed);
434 _edje_util_thaw(ed); 416 _edje_util_thaw(ed);
435 _edje_unref(ed); 417 _edje_unref(ed);
436
437 return EO_CALLBACK_CONTINUE;
438} 418}
439 419
440Eina_Bool 420Eina_Bool
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index 31028ce..f79b9e6 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -7,21 +7,18 @@ static Eo *out = NULL;
7static int outs = 0; 7static int outs = 0;
8static Eina_Bool outfail = EINA_FALSE; 8static Eina_Bool outfail = EINA_FALSE;
9 9
10static Eina_Bool 10static void
11_play_finished(void *data EINA_UNUSED, const Eo_Event *event) 11_play_finished(void *data EINA_UNUSED, const Eo_Event *event)
12{ 12{
13 eo_del(event->object); 13 eo_del(event->object);
14
15 return EINA_TRUE;
16} 14}
17 15
18static Eina_Bool 16static void
19_out_fail(void *data EINA_UNUSED, const Eo_Event *event) 17_out_fail(void *data EINA_UNUSED, const Eo_Event *event)
20{ 18{
21 outfail = EINA_TRUE; 19 outfail = EINA_TRUE;
22 eo_del(event->object); 20 eo_del(event->object);
23 out = NULL; 21 out = NULL;
24 return EINA_TRUE;
25} 22}
26 23
27struct _edje_multisense_eet_data 24struct _edje_multisense_eet_data
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index b8ad91b..5b6898a 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);
2347int _edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y); 2347int _edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y);
2348void _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y); 2348void _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y);
2349 2349
2350Eina_Bool _edje_timer_cb(void *data, const Eo_Event *event); 2350void _edje_timer_cb(void *data, const Eo_Event *event);
2351Eina_Bool _edje_pending_timer_cb(void *data); 2351Eina_Bool _edje_pending_timer_cb(void *data);
2352void _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp); 2352void _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp);
2353void _edje_callbacks_focus_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp); 2353void _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 bde316d..d3910c8 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)
50 return (e2->priority - e1->priority); 50 return (e2->priority - e1->priority);
51} 51}
52 52
53static Eina_Bool 53static void
54_cb_vpath_del(void *data, const Eo_Event *event) 54_cb_vpath_del(void *data, const Eo_Event *event)
55{ 55{
56 efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->object); 56 efl_vpath_manager_unregister(EFL_VPATH_MANAGER_CLASS, event->object);
57 eo_event_callback_del(event->object, EO_EVENT_DEL, _cb_vpath_del, data); 57 eo_event_callback_del(event->object, EO_EVENT_DEL, _cb_vpath_del, data);
58 return EINA_TRUE;
59} 58}
60 59
61EOLIAN static void 60EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 0291dd7..6efefa2 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)
23 return opt->obj; 23 return opt->obj;
24} 24}
25 25
26static Eina_Bool 26static void
27_child_added_cb_proxy(void *data, const Eo_Event *event) 27_child_added_cb_proxy(void *data, const Eo_Event *event)
28{ 28{
29 Evas_Object *box = data; 29 Evas_Object *box = data;
30 Evas_Object_Box_Option *opt = event->info; 30 Evas_Object_Box_Option *opt = event->info;
31 31
32 eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_ADDED, opt->obj); 32 eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_ADDED, opt->obj);
33
34 return EINA_TRUE;
35} 33}
36 34
37static Eina_Bool 35static void
38_child_removed_cb_proxy(void *data, const Eo_Event *event) 36_child_removed_cb_proxy(void *data, const Eo_Event *event)
39{ 37{
40 Evas_Object *box = data; 38 Evas_Object *box = data;
41 Evas_Object *child = event->info; 39 Evas_Object *child = event->info;
42 40
43 eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child); 41 eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child);
44
45 return EINA_TRUE;
46} 42}
47 43
48EOLIAN static Eina_Bool 44EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 7073964..8f544c4 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -7,7 +7,7 @@
7 7
8typedef struct _Custom_Table_Data Custom_Table_Data; 8typedef struct _Custom_Table_Data Custom_Table_Data;
9 9
10static Eina_Bool _subobj_del_cb(void *data, const Eo_Event *event); 10static void _subobj_del_cb(void *data, const Eo_Event *event);
11static void _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj); 11static void _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj);
12 12
13struct _Custom_Table_Data 13struct _Custom_Table_Data
@@ -336,7 +336,7 @@ _efl_ui_grid_efl_pack_pack_padding_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED
336 if (v) *v = pd->pad.v; 336 if (v) *v = pd->pad.v;
337} 337}
338 338
339static Eina_Bool 339static void
340_subobj_del_cb(void *data, const Eo_Event *event) 340_subobj_del_cb(void *data, const Eo_Event *event)
341{ 341{
342 Efl_Ui_Grid *obj = data; 342 Efl_Ui_Grid *obj = data;
@@ -347,8 +347,6 @@ _subobj_del_cb(void *data, const Eo_Event *event)
347 347
348 if (!elm_widget_sub_object_del(obj, event->object)) 348 if (!elm_widget_sub_object_del(obj, event->object))
349 WRN("failed to remove child from its parent"); 349 WRN("failed to remove child from its parent");
350
351 return EO_CALLBACK_CONTINUE;
352} 350}
353 351
354static Eina_Bool 352static 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 514c53c..0286727 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
500 return en->selection; 500 return en->selection;
501} 501}
502 502
503static Eina_Bool 503static void
504_sel_cursor_changed(void *data, const Eo_Event *event EINA_UNUSED) 504_sel_cursor_changed(void *data, const Eo_Event *event EINA_UNUSED)
505{ 505{
506 Efl_Canvas_Text_Cursor *obj = data; 506 Efl_Canvas_Text_Cursor *obj = data;
507 507
508 eo_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL); 508 eo_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL);
509
510 return EO_CALLBACK_CONTINUE;
511} 509}
512 510
513static void 511static void
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 514961f..7473281 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);
228static void _magnifier_move(void *data); 228static void _magnifier_move(void *data);
229static void _update_decorations(Eo *obj); 229static void _update_decorations(Eo *obj);
230static void _create_text_cursors(Efl_Ui_Text_Data *sd); 230static void _create_text_cursors(Efl_Ui_Text_Data *sd);
231static Eina_Bool _efl_ui_text_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); 231static void _efl_ui_text_changed_cb(void *data EINA_UNUSED, const Eo_Event *event);
232static Eina_Bool _efl_ui_text_selection_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); 232static void _efl_ui_text_selection_changed_cb(void *data EINA_UNUSED, const Eo_Event *event);
233static Eina_Bool _efl_ui_text_cursor_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); 233static void _efl_ui_text_cursor_changed_cb(void *data EINA_UNUSED, const Eo_Event *event);
234static void _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); 234static void _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
235static void _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd); 235static void _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd);
236static void _efl_ui_text_select_all(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd); 236static void _efl_ui_text_select_all(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd);
@@ -458,7 +458,7 @@ _validate(Evas_Object *obj)
458 vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text"); 458 vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text");
459 res = eo_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc); 459 res = eo_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc);
460 buf = eina_strbuf_new(); 460 buf = eina_strbuf_new();
461 eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EO_CALLBACK_STOP ? "fail" : "pass"); 461 eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass");
462 edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm"); 462 edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm");
463 eina_tmpstr_del(vc.signal); 463 eina_tmpstr_del(vc.signal);
464 eina_strbuf_free(buf); 464 eina_strbuf_free(buf);
@@ -1478,7 +1478,7 @@ _hover_del_job(void *data)
1478 sd->hov_deljob = NULL; 1478 sd->hov_deljob = NULL;
1479} 1479}
1480 1480
1481static Eina_Bool 1481static void
1482_hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED) 1482_hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED)
1483{ 1483{
1484 EFL_UI_TEXT_DATA_GET(data, sd); 1484 EFL_UI_TEXT_DATA_GET(data, sd);
@@ -1497,8 +1497,6 @@ _hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED)
1497 elm_widget_scroll_freeze_pop(data); 1497 elm_widget_scroll_freeze_pop(data);
1498 ecore_job_del(sd->hov_deljob); 1498 ecore_job_del(sd->hov_deljob);
1499 sd->hov_deljob = ecore_job_add(_hover_del_job, data); 1499 sd->hov_deljob = ecore_job_add(_hover_del_job, data);
1500
1501 return EINA_TRUE;
1502} 1500}
1503 1501
1504static void 1502static void
@@ -2629,13 +2627,11 @@ _anchor_hover_del_cb(void *data,
2629 (sd->anchor_hover.hover, EVAS_CALLBACK_DEL, _anchor_hover_del_cb, obj); 2627 (sd->anchor_hover.hover, EVAS_CALLBACK_DEL, _anchor_hover_del_cb, obj);
2630} 2628}
2631 2629
2632static Eina_Bool 2630static void
2633_anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 2631_anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
2634{ 2632{
2635 EFL_UI_TEXT_DATA_GET(data, sd); 2633 EFL_UI_TEXT_DATA_GET(data, sd);
2636 _efl_ui_text_anchor_hover_end(data, sd); 2634 _efl_ui_text_anchor_hover_end(data, sd);
2637
2638 return EINA_TRUE;
2639} 2635}
2640 2636
2641static void 2637static void
@@ -4059,7 +4055,7 @@ _efl_ui_text_elm_layout_theme_enable(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd E
4059 return EINA_FALSE; 4055 return EINA_FALSE;
4060} 4056}
4061 4057
4062static Eina_Bool 4058static void
4063_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) 4059_cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
4064{ 4060{
4065 const Eo_Callback_Array_Item *event = ev->info; 4061 const Eo_Callback_Array_Item *event = ev->info;
@@ -4067,10 +4063,9 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
4067 EFL_UI_TEXT_DATA_GET(ev->object, sd); 4063 EFL_UI_TEXT_DATA_GET(ev->object, sd);
4068 if (event->desc == EFL_UI_TEXT_EVENT_VALIDATE) 4064 if (event->desc == EFL_UI_TEXT_EVENT_VALIDATE)
4069 sd->validators++; 4065 sd->validators++;
4070 return EO_CALLBACK_CONTINUE;
4071} 4066}
4072 4067
4073static Eina_Bool 4068static void
4074_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) 4069_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
4075{ 4070{
4076 const Eo_Callback_Array_Item *event = ev->info; 4071 const Eo_Callback_Array_Item *event = ev->info;
@@ -4078,7 +4073,7 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
4078 EFL_UI_TEXT_DATA_GET(ev->object, sd); 4073 EFL_UI_TEXT_DATA_GET(ev->object, sd);
4079 if (event->desc == EFL_UI_TEXT_EVENT_VALIDATE) 4074 if (event->desc == EFL_UI_TEXT_EVENT_VALIDATE)
4080 sd->validators--; 4075 sd->validators--;
4081 return EO_CALLBACK_CONTINUE; 4076 return;
4082 4077
4083} 4078}
4084 4079
@@ -5604,25 +5599,22 @@ _update_decorations(Eo *obj)
5604 _update_text_selection(obj, text_obj); 5599 _update_text_selection(obj, text_obj);
5605} 5600}
5606 5601
5607static Eina_Bool 5602static void
5608_efl_ui_text_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 5603_efl_ui_text_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
5609{ 5604{
5610 _update_decorations(data); 5605 _update_decorations(data);
5611 return EINA_TRUE;
5612} 5606}
5613 5607
5614static Eina_Bool 5608static void
5615_efl_ui_text_cursor_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 5609_efl_ui_text_cursor_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
5616{ 5610{
5617 _update_text_cursors(data); 5611 _update_text_cursors(data);
5618 return EINA_TRUE;
5619} 5612}
5620 5613
5621static Eina_Bool 5614static void
5622_efl_ui_text_selection_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 5615_efl_ui_text_selection_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
5623{ 5616{
5624 _update_text_selection(data, event->object); 5617 _update_text_selection(data, event->object);
5625 return EINA_TRUE;
5626} 5618}
5627 5619
5628static void 5620static void
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 595f852..f5a0280 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
1658} 1658}
1659 1659
1660/* forward events sent to evas to the window */ 1660/* forward events sent to evas to the window */
1661static Eina_Bool 1661static void
1662_evas_event_key_cb(void *data, const Eo_Event *ev) 1662_evas_event_key_cb(void *data, const Eo_Event *ev)
1663{ 1663{
1664 Eo *win = data; 1664 Eo *win = data;
@@ -1667,17 +1667,16 @@ _evas_event_key_cb(void *data, const Eo_Event *ev)
1667 1667
1668 evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 1668 evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
1669 if (!evdata || evdata->win_fed) 1669 if (!evdata || evdata->win_fed)
1670 return EO_CALLBACK_CONTINUE; 1670 return;
1671 1671
1672 // evas_callbacks will send the event to the focussed object (ie. this win) 1672 // evas_callbacks will send the event to the focussed object (ie. this win)
1673 if (evas_focus_get(evas_object_evas_get(win)) == win) 1673 if (evas_focus_get(evas_object_evas_get(win)) == win)
1674 return EO_CALLBACK_CONTINUE; 1674 return;
1675 1675
1676 eo_event_callback_call(win, ev->desc, evt); 1676 eo_event_callback_call(win, ev->desc, evt);
1677 return EO_CALLBACK_CONTINUE;
1678} 1677}
1679 1678
1680static Eina_Bool 1679static void
1681_evas_event_pointer_cb(void *data, const Eo_Event *ev) 1680_evas_event_pointer_cb(void *data, const Eo_Event *ev)
1682{ 1681{
1683 Eo *win = data; 1682 Eo *win = data;
@@ -1686,14 +1685,13 @@ _evas_event_pointer_cb(void *data, const Eo_Event *ev)
1686 1685
1687 evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 1686 evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
1688 if (!evdata || evdata->win_fed) 1687 if (!evdata || evdata->win_fed)
1689 return EO_CALLBACK_CONTINUE; 1688 return;
1690 1689
1691 eo_event_callback_call(win, ev->desc, evt); 1690 eo_event_callback_call(win, ev->desc, evt);
1692 return EO_CALLBACK_CONTINUE;
1693} 1691}
1694 1692
1695/* feed events from the window to evas - for fake inputs */ 1693/* feed events from the window to evas - for fake inputs */
1696static Eina_Bool 1694static void
1697_evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev) 1695_evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev)
1698{ 1696{
1699 Eo *evas = data; 1697 Eo *evas = data;
@@ -1701,20 +1699,19 @@ _evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev)
1701 Efl_Event_Key_Data *evdata; 1699 Efl_Event_Key_Data *evdata;
1702 1700
1703 if (!efl_event_fake_get(evt)) 1701 if (!efl_event_fake_get(evt))
1704 return EO_CALLBACK_CONTINUE; 1702 return;
1705 1703
1706 evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 1704 evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
1707 if (!evdata || evdata->win_fed) 1705 if (!evdata || evdata->win_fed)
1708 return EO_CALLBACK_CONTINUE; 1706 return;
1709 evdata->win_fed = EINA_TRUE; 1707 evdata->win_fed = EINA_TRUE;
1710 1708
1711 eo_event_callback_call(evas, ev->desc, evt); 1709 eo_event_callback_call(evas, ev->desc, evt);
1712 evdata->win_fed = EINA_FALSE; 1710 evdata->win_fed = EINA_FALSE;
1713 evdata->evas_done = EINA_FALSE; 1711 evdata->evas_done = EINA_FALSE;
1714 return EO_CALLBACK_CONTINUE;
1715} 1712}
1716 1713
1717static Eina_Bool 1714static void
1718_evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev) 1715_evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
1719{ 1716{
1720 Eo *evas = data; 1717 Eo *evas = data;
@@ -1722,17 +1719,16 @@ _evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
1722 Efl_Event_Pointer_Data *evdata; 1719 Efl_Event_Pointer_Data *evdata;
1723 1720
1724 if (!efl_event_fake_get(evt)) 1721 if (!efl_event_fake_get(evt))
1725 return EO_CALLBACK_CONTINUE; 1722 return;
1726 1723
1727 evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 1724 evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
1728 if (!evdata || evdata->win_fed) 1725 if (!evdata || evdata->win_fed)
1729 return EO_CALLBACK_CONTINUE; 1726 return;
1730 evdata->win_fed = EINA_TRUE; 1727 evdata->win_fed = EINA_TRUE;
1731 1728
1732 eo_event_callback_call(evas, ev->desc, evt); 1729 eo_event_callback_call(evas, ev->desc, evt);
1733 evdata->win_fed = EINA_FALSE; 1730 evdata->win_fed = EINA_FALSE;
1734 evdata->evas_done = EINA_FALSE; 1731 evdata->evas_done = EINA_FALSE;
1735 return EO_CALLBACK_CONTINUE;
1736} 1732}
1737 1733
1738EO_CALLBACKS_ARRAY_DEFINE(_elm_win_evas_feed_fake_callbacks, 1734EO_CALLBACKS_ARRAY_DEFINE(_elm_win_evas_feed_fake_callbacks,
@@ -1830,7 +1826,7 @@ _elm_win_evas_device_changed(void *data,
1830 eo_event_callback_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device); 1826 eo_event_callback_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device);
1831} 1827}
1832 1828
1833static Eina_Bool 1829static void
1834_win_event_add_cb(void *data, const Eo_Event *ev) 1830_win_event_add_cb(void *data, const Eo_Event *ev)
1835{ 1831{
1836 const Eo_Callback_Array_Item *array = ev->info; 1832 const Eo_Callback_Array_Item *array = ev->info;
@@ -1937,11 +1933,9 @@ _win_event_add_cb(void *data, const Eo_Event *ev)
1937 _elm_win_evas_device_changed, win); 1933 _elm_win_evas_device_changed, win);
1938 } 1934 }
1939 } 1935 }
1940
1941 return EO_CALLBACK_CONTINUE;
1942} 1936}
1943 1937
1944static Eina_Bool 1938static void
1945_win_event_del_cb(void *data, const Eo_Event *ev) 1939_win_event_del_cb(void *data, const Eo_Event *ev)
1946{ 1940{
1947 const Eo_Callback_Array_Item *array = ev->info; 1941 const Eo_Callback_Array_Item *array = ev->info;
@@ -2048,8 +2042,6 @@ _win_event_del_cb(void *data, const Eo_Event *ev)
2048 _elm_win_evas_device_changed, win); 2042 _elm_win_evas_device_changed, win);
2049 } 2043 }
2050 } 2044 }
2051
2052 return EO_CALLBACK_CONTINUE;
2053} 2045}
2054 2046
2055static void 2047static void
@@ -5720,7 +5712,7 @@ _elm_win_focus_auto_hide(Evas_Object *obj)
5720 } 5712 }
5721} 5713}
5722 5714
5723static Eina_Bool 5715static void
5724_on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 5716_on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
5725{ 5717{
5726 Evas_Object *win; 5718 Evas_Object *win;
@@ -5749,7 +5741,6 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSE
5749 else 5741 else
5750 elm_interface_atspi_window_deactivated_signal_emit(win); 5742 elm_interface_atspi_window_deactivated_signal_emit(win);
5751 } 5743 }
5752 return EINA_TRUE;
5753} 5744}
5754 5745
5755EOLIAN static void 5746EOLIAN static void
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 04fb81d..f9e3d76 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)
90 return EINA_TRUE; 90 return EINA_TRUE;
91} 91}
92 92
93static Eina_Bool 93static void
94_on_hover_clicked(void *data, const Eo_Event *event) 94_on_hover_clicked(void *data, const Eo_Event *event)
95{ 95{
96 const char *dismissstr; 96 const char *dismissstr;
@@ -99,8 +99,6 @@ _on_hover_clicked(void *data, const Eo_Event *event)
99 99
100 if (!dismissstr || strcmp(dismissstr, "on")) 100 if (!dismissstr || strcmp(dismissstr, "on"))
101 elm_combobox_hover_end(data); // for backward compatibility 101 elm_combobox_hover_end(data); // for backward compatibility
102
103 return EINA_TRUE;
104} 102}
105 103
106static void 104static void
@@ -213,7 +211,7 @@ _on_item_pressed(void *data , Evas_Object *obj EINA_UNUSED, void *event)
213 eo_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_PRESSED, event); 211 eo_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_PRESSED, event);
214} 212}
215 213
216static Eina_Bool 214static void
217_gl_filter_finished_cb(void *data, const Eo_Event *event) 215_gl_filter_finished_cb(void *data, const Eo_Event *event)
218{ 216{
219 char buf[1024]; 217 char buf[1024];
@@ -224,7 +222,7 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event)
224 if (sd->first_filter) 222 if (sd->first_filter)
225 { 223 {
226 sd->first_filter = EINA_FALSE; 224 sd->first_filter = EINA_FALSE;
227 return EINA_TRUE; 225 return;
228 } 226 }
229 227
230 eo_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info); 228 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)
243 elm_layout_signal_emit(sd->hover, buf, "elm"); 241 elm_layout_signal_emit(sd->hover, buf, "elm");
244 edje_object_message_signal_process(elm_layout_edje_get(sd->hover)); 242 edje_object_message_signal_process(elm_layout_edje_get(sd->hover));
245 } 243 }
246
247 return EINA_TRUE;
248} 244}
249 245
250static Eina_Bool 246static void
251_on_aborted(void *data, const Eo_Event *event EINA_UNUSED) 247_on_aborted(void *data, const Eo_Event *event EINA_UNUSED)
252{ 248{
253 ELM_COMBOBOX_DATA_GET(data, sd); 249 ELM_COMBOBOX_DATA_GET(data, sd);
254 if (sd->expanded) elm_combobox_hover_end(data); 250 if (sd->expanded) elm_combobox_hover_end(data);
255 return EINA_TRUE;
256} 251}
257 252
258static Eina_Bool 253static void
259_on_changed(void *data, const Eo_Event *event EINA_UNUSED) 254_on_changed(void *data, const Eo_Event *event EINA_UNUSED)
260{ 255{
261 eo_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED, NULL); 256 eo_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED, NULL);
262 return EINA_TRUE;
263} 257}
264 258
265static Eina_Bool 259static void
266_on_clicked(void *data, const Eo_Event *event EINA_UNUSED) 260_on_clicked(void *data, const Eo_Event *event EINA_UNUSED)
267{ 261{
268 elm_combobox_hover_begin(data); 262 elm_combobox_hover_begin(data);
269 return EINA_TRUE;
270} 263}
271 264
272EOLIAN static void 265EOLIAN static void
@@ -317,34 +310,30 @@ _elm_combobox_multiple_selection_get(Eo *obj EINA_UNUSED, Elm_Combobox_Data *pd)
317 return pd->multiple_selection; 310 return pd->multiple_selection;
318} 311}
319 312
320static Eina_Bool 313static void
321_mbe_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event) 314_mbe_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event)
322{ 315{
323 //Unset the multibuttonentry to contracted mode of single line 316 //Unset the multibuttonentry to contracted mode of single line
324 elm_multibuttonentry_expanded_set(event->object, EINA_TRUE); 317 elm_multibuttonentry_expanded_set(event->object, EINA_TRUE);
325 return EINA_TRUE;
326} 318}
327 319
328static Eina_Bool 320static void
329_mbe_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 321_mbe_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
330{ 322{
331 return EINA_TRUE;
332} 323}
333 324
334static Eina_Bool 325static void
335_mbe_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event) 326_mbe_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event)
336{ 327{
337 //Set the multibuttonentry to contracted mode of single line 328 //Set the multibuttonentry to contracted mode of single line
338 elm_multibuttonentry_expanded_set(event->object, EINA_FALSE); 329 elm_multibuttonentry_expanded_set(event->object, EINA_FALSE);
339 return EINA_TRUE;
340} 330}
341 331
342static Eina_Bool 332static void
343_mbe_item_added(void *data, const Eo_Event *event EINA_UNUSED) 333_mbe_item_added(void *data, const Eo_Event *event EINA_UNUSED)
344{ 334{
345 ELM_COMBOBOX_DATA_GET(data, sd); 335 ELM_COMBOBOX_DATA_GET(data, sd);
346 elm_genlist_filter_set(sd->genlist, NULL); 336 elm_genlist_filter_set(sd->genlist, NULL);
347 return EINA_TRUE;
348} 337}
349 338
350EO_CALLBACKS_ARRAY_DEFINE(mbe_callbacks, 339EO_CALLBACKS_ARRAY_DEFINE(mbe_callbacks,
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index d3053a7..34bce99 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[] = {
56 {NULL, NULL} 56 {NULL, NULL}
57}; 57};
58 58
59static Eina_Bool _ok(void *data, const Eo_Event *event); 59static void _ok(void *data, const Eo_Event *event);
60static Eina_Bool _canc(void *data, const Eo_Event *event); 60static void _canc(void *data, const Eo_Event *event);
61static Eina_Bool _on_dir_up(void *data, const Eo_Event *event); 61static void _on_dir_up(void *data, const Eo_Event *event);
62static void _populate(Evas_Object *obj, Efl_Model *model, Elm_Object_Item *parent_it, Efl_Model *selected); 62static void _populate(Evas_Object *obj, Efl_Model *model, Elm_Object_Item *parent_it, Efl_Model *selected);
63static Elm_Fileselector_Item_Data *_selected_item_data_get(Elm_Fileselector_Data *sd); 63static Elm_Fileselector_Item_Data *_selected_item_data_get(Elm_Fileselector_Data *sd);
64 64
65static Eina_Bool _resource_created(void *, const Eo_Event *); 65static void _resource_created(void *, const Eo_Event *);
66static Eina_Bool _resource_deleted(void *, const Eo_Event *); 66static void _resource_deleted(void *, const Eo_Event *);
67static void _listing_request_cleanup(Listing_Request *); 67static void _listing_request_cleanup(Listing_Request *);
68 68
69static void 69static void
@@ -954,45 +954,37 @@ _populate(Evas_Object *obj,
954 eina_promise_then(promise_all, _process_children_cb, _process_children_error_cb, lreq); 954 eina_promise_then(promise_all, _process_children_cb, _process_children_error_cb, lreq);
955} 955}
956 956
957static Eina_Bool 957static void
958_on_list_expanded(void *data, const Eo_Event *event) 958_on_list_expanded(void *data, const Eo_Event *event)
959{ 959{
960 Elm_Object_Item *it = event->info; 960 Elm_Object_Item *it = event->info;
961 const Elm_Fileselector_Item_Data *it_data = elm_object_item_data_get(it); 961 const Elm_Fileselector_Item_Data *it_data = elm_object_item_data_get(it);
962 962
963 _populate(data, it_data->model, it, NULL); 963 _populate(data, it_data->model, it, NULL);
964
965 return EINA_TRUE;
966} 964}
967 965
968static Eina_Bool 966static void
969_on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event) 967_on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event)
970{ 968{
971 Elm_Object_Item *it = event->info; 969 Elm_Object_Item *it = event->info;
972 970
973 elm_genlist_item_subitems_clear(it); 971 elm_genlist_item_subitems_clear(it);
974
975 return EINA_TRUE;
976} 972}
977 973
978static Eina_Bool 974static void
979_on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event) 975_on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event)
980{ 976{
981 Elm_Object_Item *it = event->info; 977 Elm_Object_Item *it = event->info;
982 978
983 elm_genlist_item_expanded_set(it, EINA_TRUE); 979 elm_genlist_item_expanded_set(it, EINA_TRUE);
984
985 return EINA_TRUE;
986} 980}
987 981
988static Eina_Bool 982static void
989_on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event) 983_on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event)
990{ 984{
991 Elm_Object_Item *it = event->info; 985 Elm_Object_Item *it = event->info;
992 986
993 elm_genlist_item_expanded_set(it, EINA_FALSE); 987 elm_genlist_item_expanded_set(it, EINA_FALSE);
994
995 return EINA_TRUE;
996} 988}
997 989
998static Eina_Bool 990static Eina_Bool
@@ -1042,7 +1034,7 @@ _schedule_populate(Evas_Object *fs,
1042 sd->populate_idler = ecore_idler_add(_populate_do, sdata); 1034 sd->populate_idler = ecore_idler_add(_populate_do, sdata);
1043} 1035}
1044 1036
1045static Eina_Bool 1037static void
1046_on_item_activated(void *data, const Eo_Event *event) 1038_on_item_activated(void *data, const Eo_Event *event)
1047{ 1039{
1048 //This event_info could be a list or gengrid item 1040 //This event_info could be a list or gengrid item
@@ -1052,7 +1044,7 @@ _on_item_activated(void *data, const Eo_Event *event)
1052 ELM_FILESELECTOR_DATA_GET(data, sd); 1044 ELM_FILESELECTOR_DATA_GET(data, sd);
1053 1045
1054 it_data = elm_object_item_data_get(it); 1046 it_data = elm_object_item_data_get(it);
1055 if (!it_data) return EINA_TRUE; 1047 if (!it_data) return;
1056 1048
1057 if (!it_data->is_dir) 1049 if (!it_data->is_dir)
1058 { 1050 {
@@ -1060,14 +1052,12 @@ _on_item_activated(void *data, const Eo_Event *event)
1060 //eo_event_callback_call 1052 //eo_event_callback_call
1061 // (data, ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)it_data->model); 1053 // (data, ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)it_data->model);
1062 evas_object_smart_callback_call(data, "activated", (void *)it_data->path); 1054 evas_object_smart_callback_call(data, "activated", (void *)it_data->path);
1063 return EINA_TRUE; 1055 return;
1064 } 1056 }
1065 1057
1066 if (!sd->double_tap_navigation) return EINA_TRUE; 1058 if (!sd->double_tap_navigation) return;
1067 1059
1068 _schedule_populate(data, sd, it_data->model, NULL); 1060 _schedule_populate(data, sd, it_data->model, NULL);
1069
1070 return EINA_TRUE;
1071} 1061}
1072 1062
1073static void 1063static void
@@ -1098,7 +1088,7 @@ _clear_selections(Elm_Fileselector_Data *sd, Elm_Object_Item *last_selected)
1098 } 1088 }
1099} 1089}
1100 1090
1101static Eina_Bool 1091static void
1102_on_item_selected(void *data, const Eo_Event *event) 1092_on_item_selected(void *data, const Eo_Event *event)
1103{ 1093{
1104 //This event_info could be a list or gengrid item 1094 //This event_info could be a list or gengrid item
@@ -1108,7 +1098,7 @@ _on_item_selected(void *data, const Eo_Event *event)
1108 ELM_FILESELECTOR_DATA_GET(data, sd); 1098 ELM_FILESELECTOR_DATA_GET(data, sd);
1109 1099
1110 it_data = elm_object_item_data_get(it); 1100 it_data = elm_object_item_data_get(it);
1111 if (!it_data) return EINA_TRUE; 1101 if (!it_data) return;
1112 1102
1113 /* We need to send callback when: 1103 /* We need to send callback when:
1114 * - path is dir and mode is ONLY FOLDER 1104 * - path is dir and mode is ONLY FOLDER
@@ -1166,7 +1156,7 @@ _on_item_selected(void *data, const Eo_Event *event)
1166 { 1156 {
1167 _elm_fileselector_replace_model(data, sd, it_data->parent_model, it_data->parent_path); 1157 _elm_fileselector_replace_model(data, sd, it_data->parent_model, it_data->parent_path);
1168 _anchors_do(data, it_data->parent_path); 1158 _anchors_do(data, it_data->parent_path);
1169 return EINA_TRUE; 1159 return;
1170 } 1160 }
1171 if (sd->only_folder) 1161 if (sd->only_folder)
1172 { 1162 {
@@ -1181,19 +1171,17 @@ _on_item_selected(void *data, const Eo_Event *event)
1181 // Clear name entry not in case of save mode. 1171 // Clear name entry not in case of save mode.
1182 if (elm_object_disabled_get(sd->name_entry)) 1172 if (elm_object_disabled_get(sd->name_entry))
1183 elm_object_text_set(sd->name_entry, ""); 1173 elm_object_text_set(sd->name_entry, "");
1184 return EINA_TRUE; 1174 return;
1185 } 1175 }
1186 1176
1187 if (!it_data->is_dir) return EINA_TRUE; 1177 if (!it_data->is_dir) return;
1188 1178
1189 if (sd->double_tap_navigation) return EINA_TRUE; 1179 if (sd->double_tap_navigation) return;
1190 1180
1191 _schedule_populate(data, sd, it_data->model, NULL); 1181 _schedule_populate(data, sd, it_data->model, NULL);
1192
1193 return EINA_TRUE;
1194} 1182}
1195 1183
1196static Eina_Bool 1184static void
1197_on_item_unselected(void *data, const Eo_Event *event) 1185_on_item_unselected(void *data, const Eo_Event *event)
1198{ 1186{
1199 Eina_List *li, *l; 1187 Eina_List *li, *l;
@@ -1205,10 +1193,10 @@ _on_item_unselected(void *data, const Eo_Event *event)
1205 1193
1206 ELM_FILESELECTOR_DATA_GET(data, sd); 1194 ELM_FILESELECTOR_DATA_GET(data, sd);
1207 1195
1208 if (!sd->multi) return EINA_TRUE; 1196 if (!sd->multi) return;
1209 1197
1210 it_data = elm_object_item_data_get(it); 1198 it_data = elm_object_item_data_get(it);
1211 if (!it_data) return EINA_TRUE; 1199 if (!it_data) return;
1212 1200
1213 buf = eina_strbuf_new(); 1201 buf = eina_strbuf_new();
1214 EINA_LIST_FOREACH_SAFE(sd->multi_selection, li, l, it2) 1202 EINA_LIST_FOREACH_SAFE(sd->multi_selection, li, l, it2)
@@ -1233,11 +1221,9 @@ _on_item_unselected(void *data, const Eo_Event *event)
1233 1221
1234 elm_object_text_set(sd->name_entry, eina_strbuf_string_get(buf)); 1222 elm_object_text_set(sd->name_entry, eina_strbuf_string_get(buf));
1235 eina_strbuf_free(buf); 1223 eina_strbuf_free(buf);
1236
1237 return EINA_TRUE;
1238} 1224}
1239 1225
1240static Eina_Bool 1226static void
1241_on_dir_up(void *data, const Eo_Event *event EINA_UNUSED) 1227_on_dir_up(void *data, const Eo_Event *event EINA_UNUSED)
1242{ 1228{
1243 Evas_Object *fs = data; 1229 Evas_Object *fs = data;
@@ -1247,13 +1233,11 @@ _on_dir_up(void *data, const Eo_Event *event EINA_UNUSED)
1247 1233
1248 parent = eo_parent_get(sd->model); 1234 parent = eo_parent_get(sd->model);
1249 if (!parent) 1235 if (!parent)
1250 return EINA_TRUE; 1236 return;
1251 _populate(fs, parent, NULL, NULL); 1237 _populate(fs, parent, NULL, NULL);
1252
1253 return EINA_TRUE;
1254} 1238}
1255 1239
1256static Eina_Bool 1240static void
1257_home(void *data, const Eo_Event *event EINA_UNUSED) 1241_home(void *data, const Eo_Event *event EINA_UNUSED)
1258{ 1242{
1259 Evas_Object *fs = data; 1243 Evas_Object *fs = data;
@@ -1267,8 +1251,6 @@ _home(void *data, const Eo_Event *event EINA_UNUSED)
1267 _populate(fs, model, NULL, NULL); 1251 _populate(fs, model, NULL, NULL);
1268 eo_unref(model); 1252 eo_unref(model);
1269 } 1253 }
1270
1271 return EINA_TRUE;
1272} 1254}
1273 1255
1274static void 1256static void
@@ -1286,7 +1268,7 @@ _current_filter_changed(void *data,
1286 _populate(filter->sd->obj, filter->sd->model, NULL, NULL); 1268 _populate(filter->sd->obj, filter->sd->model, NULL, NULL);
1287} 1269}
1288 1270
1289static Eina_Bool 1271static void
1290_ok(void *data, const Eo_Event *event EINA_UNUSED) 1272_ok(void *data, const Eo_Event *event EINA_UNUSED)
1291{ 1273{
1292 const char *name; 1274 const char *name;
@@ -1299,7 +1281,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
1299 // EVENTS: should not call legacy 1281 // EVENTS: should not call legacy
1300 //eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL); 1282 //eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
1301 evas_object_smart_callback_call(fs, "done", NULL); 1283 evas_object_smart_callback_call(fs, "done", NULL);
1302 return EINA_TRUE; 1284 return;
1303 } 1285 }
1304 1286
1305 name = elm_object_text_get(sd->name_entry); 1287 name = elm_object_text_get(sd->name_entry);
@@ -1338,11 +1320,9 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
1338 // (fs, ELM_FILESELECTOR_EVENT_DONE, sd->model); 1320 // (fs, ELM_FILESELECTOR_EVENT_DONE, sd->model);
1339 evas_object_smart_callback_call(fs, "done", (void *) sd->path); 1321 evas_object_smart_callback_call(fs, "done", (void *) sd->path);
1340 } 1322 }
1341
1342 return EINA_TRUE;
1343} 1323}
1344 1324
1345static Eina_Bool 1325static void
1346_canc(void *data, const Eo_Event *event EINA_UNUSED) 1326_canc(void *data, const Eo_Event *event EINA_UNUSED)
1347{ 1327{
1348 Evas_Object *fs = data; 1328 Evas_Object *fs = data;
@@ -1350,8 +1330,6 @@ _canc(void *data, const Eo_Event *event EINA_UNUSED)
1350 // EVENTS: should not call legacy 1330 // EVENTS: should not call legacy
1351 //eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL); 1331 //eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
1352 evas_object_smart_callback_call(fs, "done", NULL); 1332 evas_object_smart_callback_call(fs, "done", NULL);
1353
1354 return EINA_TRUE;
1355} 1333}
1356 1334
1357static void 1335static void
@@ -1457,7 +1435,7 @@ _on_text_activated_set_path_then_error(void *data, Eina_Error err EINA_UNUSED)
1457 _text_activated_free_fs_data(fs); 1435 _text_activated_free_fs_data(fs);
1458} 1436}
1459 1437
1460static Eina_Bool 1438static void
1461_on_text_activated(void *data, const Eo_Event *event) 1439_on_text_activated(void *data, const Eo_Event *event)
1462{ 1440{
1463 Evas_Object *fs = data; 1441 Evas_Object *fs = data;
@@ -1468,12 +1446,12 @@ _on_text_activated(void *data, const Eo_Event *event)
1468 ELM_FILESELECTOR_DATA_GET(fs, sd); 1446 ELM_FILESELECTOR_DATA_GET(fs, sd);
1469 1447
1470 if (!sd->model) 1448 if (!sd->model)
1471 return EINA_TRUE; 1449 return;
1472 1450
1473 path = elm_widget_part_text_get(event->object, NULL); 1451 path = elm_widget_part_text_get(event->object, NULL);
1474 model = eo_add(eo_class_get(sd->model), NULL); 1452 model = eo_add(eo_class_get(sd->model), NULL);
1475 if (!model) 1453 if (!model)
1476 return EINA_TRUE; 1454 return;
1477 1455
1478 _model_str_property_set(model, "path", path, &promise); 1456 _model_str_property_set(model, "path", path, &promise);
1479 1457
@@ -1487,8 +1465,6 @@ _on_text_activated(void *data, const Eo_Event *event)
1487 1465
1488 eo_unref(model); 1466 eo_unref(model);
1489 elm_object_focus_set(event->object, EINA_FALSE); 1467 elm_object_focus_set(event->object, EINA_FALSE);
1490
1491 return EINA_TRUE;
1492} 1468}
1493 1469
1494static Eina_Bool 1470static Eina_Bool
@@ -1504,27 +1480,23 @@ _anchors_undo(void *data)
1504 return ECORE_CALLBACK_CANCEL; 1480 return ECORE_CALLBACK_CANCEL;
1505} 1481}
1506 1482
1507static Eina_Bool 1483static void
1508_on_text_focused(void *data, const Eo_Event *event EINA_UNUSED) 1484_on_text_focused(void *data, const Eo_Event *event EINA_UNUSED)
1509{ 1485{
1510 ELM_FILESELECTOR_DATA_GET(data, sd); 1486 ELM_FILESELECTOR_DATA_GET(data, sd);
1511 1487
1512 if (!sd->path_entry_idler) 1488 if (!sd->path_entry_idler)
1513 sd->path_entry_idler = ecore_idler_add(_anchors_undo, data); 1489 sd->path_entry_idler = ecore_idler_add(_anchors_undo, data);
1514
1515 return EINA_TRUE;
1516} 1490}
1517 1491
1518static Eina_Bool 1492static void
1519_on_text_unfocused(void *data, const Eo_Event *event EINA_UNUSED) 1493_on_text_unfocused(void *data, const Eo_Event *event EINA_UNUSED)
1520{ 1494{
1521 ELM_FILESELECTOR_DATA_GET(data, sd); 1495 ELM_FILESELECTOR_DATA_GET(data, sd);
1522 _anchors_do(data, sd->path); 1496 _anchors_do(data, sd->path);
1523
1524 return EINA_TRUE;
1525} 1497}
1526 1498
1527static Eina_Bool 1499static void
1528_anchor_clicked(void *data, const Eo_Event *event) 1500_anchor_clicked(void *data, const Eo_Event *event)
1529{ 1501{
1530 Elm_Entry_Anchor_Info *info = event->info; 1502 Elm_Entry_Anchor_Info *info = event->info;
@@ -1534,11 +1506,11 @@ _anchor_clicked(void *data, const Eo_Event *event)
1534 ELM_FILESELECTOR_DATA_GET(fs, sd); 1506 ELM_FILESELECTOR_DATA_GET(fs, sd);
1535 1507
1536 if (!sd->model) 1508 if (!sd->model)
1537 return EINA_TRUE; 1509 return;
1538 1510
1539 model = eo_add(eo_class_get(sd->model), NULL); 1511 model = eo_add(eo_class_get(sd->model), NULL);
1540 if (!model) 1512 if (!model)
1541 return EINA_TRUE; 1513 return;
1542 _model_str_property_set(model, "path", info->name, NULL); 1514 _model_str_property_set(model, "path", info->name, NULL);
1543 1515
1544 _populate(fs, model, NULL, NULL); 1516 _populate(fs, model, NULL, NULL);
@@ -1551,11 +1523,9 @@ _anchor_clicked(void *data, const Eo_Event *event)
1551 ecore_idler_del(sd->path_entry_idler); 1523 ecore_idler_del(sd->path_entry_idler);
1552 sd->path_entry_idler = NULL; 1524 sd->path_entry_idler = NULL;
1553 } 1525 }
1554
1555 return EINA_TRUE;
1556} 1526}
1557 1527
1558static Eina_Bool 1528static void
1559_files_key_down(void *data, const Eo_Event *event) 1529_files_key_down(void *data, const Eo_Event *event)
1560{ 1530{
1561 Efl_Event_Key *ev = event->info; 1531 Efl_Event_Key *ev = event->info;
@@ -1565,7 +1535,7 @@ _files_key_down(void *data, const Eo_Event *event)
1565 par = data; 1535 par = data;
1566 searchbar = evas_object_data_get(par, "search"); 1536 searchbar = evas_object_data_get(par, "search");
1567 1537
1568 if (!searchbar) return EINA_TRUE; 1538 if (!searchbar) return;
1569 1539
1570 key = efl_event_key_get(ev); 1540 key = efl_event_key_get(ev);
1571 string = efl_event_key_string_get(ev); 1541 string = efl_event_key_string_get(ev);
@@ -1588,8 +1558,6 @@ _files_key_down(void *data, const Eo_Event *event)
1588 efl_event_processed_set(ev, EINA_TRUE); 1558 efl_event_processed_set(ev, EINA_TRUE);
1589 } 1559 }
1590 } 1560 }
1591
1592 return EINA_TRUE;
1593} 1561}
1594 1562
1595static Evas_Object * 1563static Evas_Object *
@@ -1733,7 +1701,7 @@ cancel:
1733 free(it_data); 1701 free(it_data);
1734} 1702}
1735 1703
1736static Eina_Bool 1704static void
1737_resource_created(void *data, const Eo_Event *event) 1705_resource_created(void *data, const Eo_Event *event)
1738{ 1706{
1739 Elm_Fileselector *fs = data; 1707 Elm_Fileselector *fs = data;
@@ -1746,11 +1714,11 @@ _resource_created(void *data, const Eo_Event *event)
1746 ELM_FILESELECTOR_DATA_GET(fs, sd); 1714 ELM_FILESELECTOR_DATA_GET(fs, sd);
1747 1715
1748 if (!sd || !sd->monitoring || sd->model != event->object) 1716 if (!sd || !sd->monitoring || sd->model != event->object)
1749 return ECORE_CALLBACK_PASS_ON; 1717 return;
1750 1718
1751 it_data = calloc(1, sizeof(Elm_Fileselector_Item_Data)); 1719 it_data = calloc(1, sizeof(Elm_Fileselector_Item_Data));
1752 if (!it_data) 1720 if (!it_data)
1753 return ECORE_CALLBACK_PASS_ON; 1721 return;
1754 1722
1755 it_data->model = eo_ref(child); 1723 it_data->model = eo_ref(child);
1756 it_data->user_data = eo_ref(fs); 1724 it_data->user_data = eo_ref(fs);
@@ -1769,10 +1737,10 @@ _resource_created(void *data, const Eo_Event *event)
1769 1737
1770 eina_promise_then(promise_all, _resource_created_then, _resource_then_error, it_data); 1738 eina_promise_then(promise_all, _resource_created_then, _resource_then_error, it_data);
1771 1739
1772 return ECORE_CALLBACK_PASS_ON; 1740 return;
1773} 1741}
1774 1742
1775static Eina_Bool 1743static void
1776_resource_deleted(void *data, const Eo_Event *event) 1744_resource_deleted(void *data, const Eo_Event *event)
1777{ 1745{
1778 Evas_Object *obj = data; 1746 Evas_Object *obj = data;
@@ -1784,7 +1752,7 @@ _resource_deleted(void *data, const Eo_Event *event)
1784 ELM_FILESELECTOR_DATA_GET(obj, sd); 1752 ELM_FILESELECTOR_DATA_GET(obj, sd);
1785 1753
1786 if (!sd || !sd->monitoring || sd->model != event->object) 1754 if (!sd || !sd->monitoring || sd->model != event->object)
1787 return ECORE_CALLBACK_PASS_ON; 1755 return;
1788 1756
1789 if (sd->mode == ELM_FILESELECTOR_LIST) 1757 if (sd->mode == ELM_FILESELECTOR_LIST)
1790 { 1758 {
@@ -1852,10 +1820,10 @@ _resource_deleted(void *data, const Eo_Event *event)
1852 elm_object_text_set(sd->name_entry, ""); 1820 elm_object_text_set(sd->name_entry, "");
1853 } 1821 }
1854 1822
1855 return ECORE_CALLBACK_PASS_ON; 1823 return;
1856} 1824}
1857 1825
1858static Eina_Bool 1826static void
1859_preedit_cb(void *data, const Eo_Event *event) 1827_preedit_cb(void *data, const Eo_Event *event)
1860{ 1828{
1861 ELM_FILESELECTOR_DATA_GET(data, sd); 1829 ELM_FILESELECTOR_DATA_GET(data, sd);
@@ -1864,8 +1832,6 @@ _preedit_cb(void *data, const Eo_Event *event)
1864 1832
1865 if (sd->search_string && sd->model) 1833 if (sd->search_string && sd->model)
1866 _populate(data, sd->model, NULL, NULL); 1834 _populate(data, sd->model, NULL, NULL);
1867
1868 return EINA_TRUE;
1869} 1835}
1870 1836
1871EOLIAN static void 1837EOLIAN static void
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 23e53e3..ff18f2d 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)
84 eina_stringshare_replace(&sd->fsd.path, NULL); 84 eina_stringshare_replace(&sd->fsd.path, NULL);
85} 85}
86 86
87static Eina_Bool 87static void
88_selection_done(void *data, const Eo_Event *event) 88_selection_done(void *data, const Eo_Event *event)
89{ 89{
90 Elm_Fileselector_Button_Data *sd = data; 90 Elm_Fileselector_Button_Data *sd = data;
@@ -109,8 +109,6 @@ _selection_done(void *data, const Eo_Event *event)
109 // EVENTS: should not call legacy 109 // EVENTS: should not call legacy
110 //eo_event_callback_call 110 //eo_event_callback_call
111 // (sd->obj, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN, (void *)model); 111 // (sd->obj, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN, (void *)model);
112
113 return EINA_TRUE;
114} 112}
115 113
116 114
@@ -209,12 +207,10 @@ _activate(Elm_Fileselector_Button_Data *sd)
209 } 207 }
210} 208}
211 209
212static Eina_Bool 210static void
213_button_clicked(void *data, const Eo_Event *event EINA_UNUSED) 211_button_clicked(void *data, const Eo_Event *event EINA_UNUSED)
214{ 212{
215 _activate(data); 213 _activate(data);
216
217 return EINA_TRUE;
218} 214}
219 215
220EOLIAN static void 216EOLIAN static void
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index e15414b..970c5bc 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[] =
46#undef ELM_PRIV_FILESELECTOR_ENTRY_SIGNALS 46#undef ELM_PRIV_FILESELECTOR_ENTRY_SIGNALS
47 47
48#define SIG_FWD(name, event) \ 48#define SIG_FWD(name, event) \
49 static Eina_Bool \ 49 static void \
50 _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \ 50 _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \
51 { \ 51 { \
52 eo_event_callback_call(data, event, ev->info); \ 52 eo_event_callback_call(data, event, ev->info); \
53 \
54 return EINA_TRUE; \
55 } 53 }
56SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED) 54SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED)
57SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS) 55SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
@@ -84,13 +82,13 @@ _file_chosen_path_then(void *data, void *v)
84 free(s); 82 free(s);
85} 83}
86 84
87static Eina_Bool 85static void
88_FILE_CHOSEN_fwd(void *data, const Eo_Event *event) 86_FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
89{ 87{
90 Efl_Model *model = event->info; 88 Efl_Model *model = event->info;
91 Eina_Promise *promise = NULL; 89 Eina_Promise *promise = NULL;
92 90
93 if (!model) return EINA_TRUE; 91 if (!model) return;
94 92
95 promise = efl_model_property_get(model, "path"); 93 promise = efl_model_property_get(model, "path");
96 eina_promise_then(promise, _file_chosen_path_then, NULL, data); 94 eina_promise_then(promise, _file_chosen_path_then, NULL, data);
@@ -98,8 +96,6 @@ _FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
98 // EVENTS: should not call legacy 96 // EVENTS: should not call legacy
99 //eo_event_callback_call 97 //eo_event_callback_call
100 // (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->info); 98 // (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->info);
101
102 return EINA_TRUE;
103} 99}
104 100
105// EVENTS: should not need this function 101// EVENTS: should not need this function
@@ -114,7 +110,7 @@ _FILE_CHOSEN_fwd_path(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
114 _FILE_CHOSEN_fwd(data, &e); 110 _FILE_CHOSEN_fwd(data, &e);
115} 111}
116 112
117static Eina_Bool 113static void
118_ACTIVATED_fwd(void *data, const Eo_Event *event) 114_ACTIVATED_fwd(void *data, const Eo_Event *event)
119{ 115{
120 const char *file; 116 const char *file;
@@ -138,8 +134,6 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
138 134
139 eo_event_callback_call 135 eo_event_callback_call
140 (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->info); 136 (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->info);
141
142 return EINA_TRUE;
143} 137}
144 138
145static void 139static void
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 43d9167..fc3b4ba 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)
109 return EINA_TRUE; 109 return EINA_TRUE;
110} 110}
111 111
112static Eina_Bool 112static void
113_on_hover_clicked(void *data, const Eo_Event *event) 113_on_hover_clicked(void *data, const Eo_Event *event)
114{ 114{
115 const char *dismissstr; 115 const char *dismissstr;
@@ -118,8 +118,6 @@ _on_hover_clicked(void *data, const Eo_Event *event)
118 118
119 if (!dismissstr || strcmp(dismissstr, "on")) 119 if (!dismissstr || strcmp(dismissstr, "on"))
120 elm_hoversel_hover_end(data); // for backward compatibility 120 elm_hoversel_hover_end(data); // for backward compatibility
121
122 return EINA_TRUE;
123} 121}
124 122
125static void 123static void
@@ -153,7 +151,7 @@ _auto_update(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
153 } 151 }
154} 152}
155 153
156static Eina_Bool 154static void
157_on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 155_on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
158{ 156{
159 Elm_Hoversel_Item_Data *item = data; 157 Elm_Hoversel_Item_Data *item = data;
@@ -168,28 +166,22 @@ _on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
168 evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item); 166 evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item);
169 167
170 elm_hoversel_hover_end(obj2); 168 elm_hoversel_hover_end(obj2);
171
172 return EINA_TRUE;
173} 169}
174 170
175static Eina_Bool 171static void
176_item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 172_item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
177{ 173{
178 Elm_Hoversel_Item_Data *it = data; 174 Elm_Hoversel_Item_Data *it = data;
179 175
180 eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it)); 176 eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it));
181
182 return EINA_TRUE;
183} 177}
184 178
185static Eina_Bool 179static void
186_item_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 180_item_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
187{ 181{
188 Elm_Hoversel_Item_Data *it = data; 182 Elm_Hoversel_Item_Data *it = data;
189 183
190 eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it)); 184 eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
191
192 return EINA_TRUE;
193} 185}
194 186
195static void 187static void
@@ -440,20 +432,16 @@ _activate(Evas_Object *obj)
440 evas_object_show(sd->hover); 432 evas_object_show(sd->hover);
441} 433}
442 434
443static Eina_Bool 435static void
444_on_clicked(void *data, const Eo_Event *event EINA_UNUSED) 436_on_clicked(void *data, const Eo_Event *event EINA_UNUSED)
445{ 437{
446 _activate(data); 438 _activate(data);
447
448 return EINA_TRUE;
449} 439}
450 440
451static Eina_Bool 441static void
452_on_parent_del(void *data, const Eo_Event *ev EINA_UNUSED) 442_on_parent_del(void *data, const Eo_Event *ev EINA_UNUSED)
453{ 443{
454 elm_hoversel_hover_parent_set(data, NULL); 444 elm_hoversel_hover_parent_set(data, NULL);
455
456 return EINA_TRUE;
457} 445}
458 446
459EOLIAN static void 447EOLIAN static void
@@ -550,14 +538,12 @@ _on_move_resize(void * data,
550 _resizing_eval(obj, sd); 538 _resizing_eval(obj, sd);
551} 539}
552 540
553static Eina_Bool 541static void
554_on_parent_resize(void *data, const Eo_Event *ev EINA_UNUSED) 542_on_parent_resize(void *data, const Eo_Event *ev EINA_UNUSED)
555{ 543{
556 Evas_Object *obj = (Evas_Object *)data; 544 Evas_Object *obj = (Evas_Object *)data;
557 ELM_HOVERSEL_DATA_GET(obj, sd); 545 ELM_HOVERSEL_DATA_GET(obj, sd);
558 _on_move_resize(sd, NULL, obj, NULL); 546 _on_move_resize(sd, NULL, obj, NULL);
559
560 return EINA_TRUE;
561} 547}
562 548
563EOLIAN static void 549EOLIAN static void
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index e19ea28..5932ca2 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[] = {
45 {NULL, NULL} 45 {NULL, NULL}
46}; 46};
47 47
48static Eina_Bool 48static void _entry_changed_cb(void *data, const Eo_Event *event);
49_entry_changed_cb(void *data, const Eo_Event *event); 49static void _entry_focus_in_cb(void *data, const Eo_Event *event);
50static Eina_Bool 50static void _entry_focus_out_cb(void *data, const Eo_Event *event);
51_entry_focus_in_cb(void *data, const Eo_Event *event); 51static void _entry_clicked_cb(void *data, const Eo_Event *event);
52static Eina_Bool
53_entry_focus_out_cb(void *data, const Eo_Event *event);
54static Eina_Bool
55_entry_clicked_cb(void *data, const Eo_Event *event);
56 52
57EO_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb, 53EO_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
58 { ELM_MULTIBUTTONENTRY_EVENT_CHANGED, _entry_changed_cb }, 54 { ELM_MULTIBUTTONENTRY_EVENT_CHANGED, _entry_changed_cb },
@@ -1039,23 +1035,21 @@ _entry_resize_cb(void *data,
1039 elm_widget_show_region_set(sd->entry, en_x, en_y, en_w, en_h, EINA_TRUE); 1035 elm_widget_show_region_set(sd->entry, en_x, en_y, en_w, en_h, EINA_TRUE);
1040} 1036}
1041 1037
1042static Eina_Bool 1038static void
1043_entry_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 1039_entry_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
1044{ 1040{
1045 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); 1041 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1046 const char *str; 1042 const char *str;
1047 1043
1048 str = elm_object_text_get(sd->entry); 1044 str = elm_object_text_get(sd->entry);
1049 sd->n_str = str ? strlen(str) : 0; 1045 sd->n_str = str ? strlen(str) : 0;
1050
1051 return EINA_TRUE;
1052} 1046}
1053 1047
1054static Eina_Bool 1048static void
1055_entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED) 1049_entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED)
1056{ 1050{
1057 Elm_Multibuttonentry_Item_Data *item = NULL; 1051 Elm_Multibuttonentry_Item_Data *item = NULL;
1058 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); 1052 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1059 1053
1060 if (sd->selected_it) 1054 if (sd->selected_it)
1061 { 1055 {
@@ -1063,32 +1057,26 @@ _entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED)
1063 elm_object_focus_set(sd->entry, EINA_FALSE); 1057 elm_object_focus_set(sd->entry, EINA_FALSE);
1064 elm_object_focus_set(VIEW(item), EINA_TRUE); 1058 elm_object_focus_set(VIEW(item), EINA_TRUE);
1065 } 1059 }
1066
1067 return EINA_TRUE;
1068} 1060}
1069 1061
1070static Eina_Bool 1062static void
1071_entry_focus_out_cb(void *data, const Eo_Event *event EINA_UNUSED) 1063_entry_focus_out_cb(void *data, const Eo_Event *event EINA_UNUSED)
1072{ 1064{
1073 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); 1065 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1074 const char *str; 1066 const char *str;
1075 1067
1076 str = elm_object_text_get(sd->entry); 1068 str = elm_object_text_get(sd->entry);
1077 if (str && str[0]) 1069 if (str && str[0])
1078 _item_new(sd, str, MULTIBUTTONENTRY_POS_END, NULL, NULL, NULL); 1070 _item_new(sd, str, MULTIBUTTONENTRY_POS_END, NULL, NULL, NULL);
1079
1080 return EINA_TRUE;
1081} 1071}
1082 1072
1083static Eina_Bool 1073static void
1084_entry_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 1074