summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-06-20 15:31:31 +0100
committerTom Hacohen <tom@stosb.com>2016-06-20 18:02:00 +0100
commit6202cc7485a54dea6f02a2668e7c907247902dd1 (patch)
tree7a1fa2b61175b1ef75a9bff7299a0ce3daa45216 /src/tests
parentd648eb5311585f7392d0290640ba133814b52589 (diff)
Adjust the code according to the eo event stop changes.
This was changed in the previous commit.
Diffstat (limited to '')
-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
17 files changed, 64 insertions, 124 deletions
diff --git a/src/tests/ecore/ecore_test_args.c b/src/tests/ecore/ecore_test_args.c
index 84ff61a..eb6d13c 100644
--- a/src/tests/ecore/ecore_test_args.c
+++ b/src/tests/ecore/ecore_test_args.c
@@ -5,7 +5,7 @@
5#include <Ecore.h> 5#include <Ecore.h>
6#include "ecore_suite.h" 6#include "ecore_suite.h"
7 7
8static Eina_Bool 8static void
9_cb_args1(void *data EINA_UNUSED, const Eo_Event *event) 9_cb_args1(void *data EINA_UNUSED, const Eo_Event *event)
10{ 10{
11 Efl_Loop_Args *args = event->info; 11 Efl_Loop_Args *args = event->info;
@@ -22,7 +22,6 @@ _cb_args1(void *data EINA_UNUSED, const Eo_Event *event)
22 fail_if(!!strcmp(efl_loop_args_arg_get(args, 6), "g")); 22 fail_if(!!strcmp(efl_loop_args_arg_get(args, 6), "g"));
23 fail_if(!!strcmp(efl_loop_args_arg_get(args, 7), "h")); 23 fail_if(!!strcmp(efl_loop_args_arg_get(args, 7), "h"));
24 ecore_main_loop_quit(); 24 ecore_main_loop_quit();
25 return EO_CALLBACK_CONTINUE;
26} 25}
27 26
28START_TEST(ecore_test_args1) 27START_TEST(ecore_test_args1)
@@ -41,7 +40,7 @@ START_TEST(ecore_test_args1)
41} 40}
42END_TEST 41END_TEST
43 42
44static Eina_Bool 43static void
45_cb_args2(void *data EINA_UNUSED, const Eo_Event *event) 44_cb_args2(void *data EINA_UNUSED, const Eo_Event *event)
46{ 45{
47 Efl_Loop_Args *args = event->info; 46 Efl_Loop_Args *args = event->info;
@@ -51,7 +50,6 @@ _cb_args2(void *data EINA_UNUSED, const Eo_Event *event)
51 fail_if(n != 1); 50 fail_if(n != 1);
52 fail_if(!!strcmp(efl_loop_args_arg_get(args, 0), "hello world")); 51 fail_if(!!strcmp(efl_loop_args_arg_get(args, 0), "hello world"));
53 ecore_main_loop_quit(); 52 ecore_main_loop_quit();
54 return EO_CALLBACK_CONTINUE;
55} 53}
56 54
57START_TEST(ecore_test_args2) 55START_TEST(ecore_test_args2)
@@ -70,7 +68,7 @@ START_TEST(ecore_test_args2)
70} 68}
71END_TEST 69END_TEST
72 70
73static Eina_Bool 71static void
74_cb_args3(void *data EINA_UNUSED, const Eo_Event *event) 72_cb_args3(void *data EINA_UNUSED, const Eo_Event *event)
75{ 73{
76 Efl_Loop_Args *args = event->info; 74 Efl_Loop_Args *args = event->info;
@@ -79,7 +77,6 @@ _cb_args3(void *data EINA_UNUSED, const Eo_Event *event)
79 n = efl_loop_args_arg_num_get(args); 77 n = efl_loop_args_arg_num_get(args);
80 fail_if(n != 0); 78 fail_if(n != 0);
81 ecore_main_loop_quit(); 79 ecore_main_loop_quit();
82 return EO_CALLBACK_CONTINUE;
83} 80}
84 81
85START_TEST(ecore_test_args3) 82START_TEST(ecore_test_args3)
@@ -93,7 +90,7 @@ START_TEST(ecore_test_args3)
93} 90}
94END_TEST 91END_TEST
95 92
96static Eina_Bool 93static void
97_cb_args4(void *data EINA_UNUSED, const Eo_Event *event) 94_cb_args4(void *data EINA_UNUSED, const Eo_Event *event)
98{ 95{
99 Efl_Loop_Args *args = event->info; 96 Efl_Loop_Args *args = event->info;
@@ -105,7 +102,6 @@ _cb_args4(void *data EINA_UNUSED, const Eo_Event *event)
105 fail_if(!!strcmp(efl_loop_args_arg_get(args, 1), "xxxxx")); 102 fail_if(!!strcmp(efl_loop_args_arg_get(args, 1), "xxxxx"));
106 fail_if(!!strcmp(efl_loop_args_arg_get(args, 2), "y")); 103 fail_if(!!strcmp(efl_loop_args_arg_get(args, 2), "y"));
107 ecore_main_loop_quit(); 104 ecore_main_loop_quit();
108 return EO_CALLBACK_CONTINUE;
109} 105}
110 106
111START_TEST(ecore_test_args4) 107START_TEST(ecore_test_args4)
diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index 338bb74..41858c0 100644
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -267,15 +267,13 @@ START_TEST(ecore_test_ecore_main_loop_fd_handler)
267} 267}
268END_TEST 268END_TEST
269 269
270static Eina_Bool 270static void
271_eo_read_cb(void *data, const Eo_Event *info EINA_UNUSED) 271_eo_read_cb(void *data, const Eo_Event *info EINA_UNUSED)
272{ 272{
273 Eina_Bool *did = data; 273 Eina_Bool *did = data;
274 274
275 *did = EINA_TRUE; 275 *did = EINA_TRUE;
276 ecore_main_loop_quit(); 276 ecore_main_loop_quit();
277
278 return EO_CALLBACK_CONTINUE;
279} 277}
280 278
281START_TEST(ecore_test_efl_loop_fd) 279START_TEST(ecore_test_efl_loop_fd)
@@ -310,14 +308,12 @@ START_TEST(ecore_test_efl_loop_fd)
310} 308}
311END_TEST 309END_TEST
312 310
313static Eina_Bool 311static void
314_eo_del_cb(void *data, const Eo_Event *ev EINA_UNUSED) 312_eo_del_cb(void *data, const Eo_Event *ev EINA_UNUSED)
315{ 313{
316 Eina_Bool *dead = data; 314 Eina_Bool *dead = data;
317 315
318 *dead = EINA_TRUE; 316 *dead = EINA_TRUE;
319
320 return EINA_TRUE;
321} 317}
322 318
323START_TEST(ecore_test_efl_loop_fd_lifecycle) 319START_TEST(ecore_test_efl_loop_fd_lifecycle)
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 480e5a2..dda71e3 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -11,7 +11,7 @@
11 11
12#include "ecore_suite.h" 12#include "ecore_suite.h"
13 13
14static Eina_Bool _failed_cb(void *data, const Eo_Event *event EINA_UNUSED) 14static void _failed_cb(void *data, const Eo_Event *event EINA_UNUSED)
15{ 15{
16 Eina_Bool *pulse_context_failed = data; 16 Eina_Bool *pulse_context_failed = data;
17 17
@@ -21,22 +21,16 @@ static Eina_Bool _failed_cb(void *data, const Eo_Event *event EINA_UNUSED)
21 *pulse_context_failed = (pa_check == 0); 21 *pulse_context_failed = (pa_check == 0);
22 } 22 }
23 ecore_main_loop_quit(); 23 ecore_main_loop_quit();
24
25 return EINA_TRUE;
26} 24}
27 25
28static Eina_Bool _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 26static void _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
29{ 27{
30 ecore_main_loop_quit(); 28 ecore_main_loop_quit();
31
32 return EINA_TRUE;
33} 29}
34 30
35static Eina_Bool _looped_cb(void *data EINA_UNUSED, const Eo_Event *event) 31static void _looped_cb(void *data EINA_UNUSED, const Eo_Event *event)
36{ 32{
37 ecore_audio_obj_in_looped_set(event->object, EINA_FALSE); 33 ecore_audio_obj_in_looped_set(event->object, EINA_FALSE);
38
39 return EINA_TRUE;
40} 34}
41 35
42#ifdef HAVE_PULSE 36#ifdef HAVE_PULSE
diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c
index 336538f..4394643 100644
--- a/src/tests/ecore/ecore_test_timer.c
+++ b/src/tests/ecore/ecore_test_timer.c
@@ -252,20 +252,18 @@ _test_time_cb(void *data)
252 return EINA_TRUE; 252 return EINA_TRUE;
253} 253}
254 254
255static Eina_Bool 255static void
256_test_death_cb(void *data, const Eo_Event *ev EINA_UNUSED) 256_test_death_cb(void *data, const Eo_Event *ev EINA_UNUSED)
257{ 257{
258 Eina_Bool *die = data; 258 Eina_Bool *die = data;
259 259
260 *die = EINA_TRUE; 260 *die = EINA_TRUE;
261
262 return EINA_TRUE;
263} 261}
264 262
265static Eina_Bool 263static void
266_test_run_cb(void *data, const Eo_Event *ev EINA_UNUSED) 264_test_run_cb(void *data, const Eo_Event *ev EINA_UNUSED)
267{ 265{
268 return _test_time_cb(data); 266 _test_time_cb(data);
269} 267}
270 268
271START_TEST(ecore_test_timer_lifecycle) 269START_TEST(ecore_test_timer_lifecycle)
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index 919797a..d6c54be 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -21,7 +21,7 @@ struct _pair
21 Eo *parent, *child; 21 Eo *parent, *child;
22}; 22};
23 23
24static Eina_Bool 24static void
25_children_removed_cb(void *data EINA_UNUSED, const Eo_Event* event) 25_children_removed_cb(void *data EINA_UNUSED, const Eo_Event* event)
26{ 26{
27 fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__); 27 fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__);
@@ -39,10 +39,9 @@ _children_removed_cb(void *data EINA_UNUSED, const Eo_Event* event)
39 free(filename); 39 free(filename);
40 eina_promise_unref(promise); 40 eina_promise_unref(promise);
41 } 41 }
42 return EINA_TRUE;
43} 42}
44 43
45static Eina_Bool 44static void
46_children_added_cb(void *data EINA_UNUSED, const Eo_Event* event) 45_children_added_cb(void *data EINA_UNUSED, const Eo_Event* event)
47{ 46{
48 fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__); 47 fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__);
@@ -61,8 +60,6 @@ _children_added_cb(void *data EINA_UNUSED, const Eo_Event* event)
61 free(filename); 60 free(filename);
62 61
63 eina_promise_unref(promise); 62 eina_promise_unref(promise);
64
65 return EINA_TRUE;
66} 63}
67 64
68static void 65static void
diff --git a/src/tests/eio/eio_test_job_xattr.c b/src/tests/eio/eio_test_job_xattr.c
index f2fd2bb..52a988a 100644
--- a/src/tests/eio/eio_test_job_xattr.c
+++ b/src/tests/eio/eio_test_job_xattr.c
@@ -35,12 +35,12 @@ static const char *attr_data[] =
35 35
36int total_attributes = sizeof(attribute)/sizeof(attribute[0]); 36int total_attributes = sizeof(attribute)/sizeof(attribute[0]);
37 37
38static Eina_Bool 38static void
39_filter_cb(void *data EINA_UNUSED, const Eo_Event *event) 39_filter_cb(void *data EINA_UNUSED, const Eo_Event *event)
40{ 40{
41 Eio_Filter_Name_Data *event_info = event->info; 41 Eio_Filter_Name_Data *event_info = event->info;
42 42
43 return event_info->filter = EINA_TRUE; 43 event_info->filter = EINA_TRUE;
44} 44}
45 45
46static void 46static void
diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c
index 4f3c6c7..5a7247a 100644
--- a/src/tests/eio/eio_test_sentry.c
+++ b/src/tests/eio/eio_test_sentry.c
@@ -104,11 +104,10 @@ static Eina_Bool _modify_attrib_file(void *data)
104 104
105/////// helper functions 105/////// helper functions
106 106
107static Eina_Bool _check_event_path(void *data, const Eo_Event *event) 107static void _check_event_path(void *data, const Eo_Event *event)
108{ 108{
109 Eio_Sentry_Event *event_info = event->info; 109 Eio_Sentry_Event *event_info = event->info;
110 ck_assert_str_eq((const char*)data, event_info->trigger); 110 ck_assert_str_eq((const char*)data, event_info->trigger);
111 return EINA_TRUE;
112} 111}
113 112
114static Eina_Tmpstr *_common_init() 113static Eina_Tmpstr *_common_init()
@@ -220,11 +219,9 @@ END_TEST
220 219
221static void _target_notified_cb(void *data, const Eo_Event *event) 220static void _target_notified_cb(void *data, const Eo_Event *event)
222{ 221{
223 if (_check_event_path(data, event)) 222 _check_event_path(data, event);
224 { 223 _cancel_timeout();
225 _cancel_timeout(); 224 ecore_main_loop_quit();
226 ecore_main_loop_quit();
227 }
228} 225}
229 226
230 227
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index 9d6c74c..9c63e8b 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -64,11 +64,11 @@ _error_then_cb(void* data EINA_UNUSED, Eina_Error error)
64 ecore_main_loop_quit(); 64 ecore_main_loop_quit();
65} 65}
66 66
67static Eina_Bool 67static void
68_eo_event_quit_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 68_eo_event_quit_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
69{ 69{
70 ecore_main_loop_quit(); 70 ecore_main_loop_quit();
71 return EINA_FALSE; 71 eo_event_callback_stop(event->object);
72} 72}
73 73
74void * 74void *
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index aeab090..3bd1790 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -80,17 +80,15 @@ START_TEST(elm_atspi_children_get2)
80} 80}
81END_TEST 81END_TEST
82 82
83static Eina_Bool 83static void
84_children_changed_cb(void *data EINA_UNUSED, const Eo_Event *event) 84_children_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
85{ 85{
86 if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED) 86 if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED)
87 return EINA_TRUE; 87 return;
88 88
89 ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info; 89 ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info;
90 current = event->object; 90 current = event->object;
91 counter++; 91 counter++;
92
93 return EINA_TRUE;
94} 92}
95 93
96START_TEST(elm_atspi_children_events_add) 94START_TEST(elm_atspi_children_events_add)
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index 755f5be..e960ac6 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -34,17 +34,16 @@ START_TEST (elm_atspi_role_get)
34} 34}
35END_TEST 35END_TEST
36 36
37static Eina_Bool 37static void
38_async_error_cb(void *data, const Eo_Event *event) 38_async_error_cb(void *data, const Eo_Event *event)
39{ 39{
40 Test_Data *td = data; 40 Test_Data *td = data;
41 char path[PATH_MAX]; 41 char path[PATH_MAX];
42 sprintf(path, pathfmt, td->image_id); 42 sprintf(path, pathfmt, td->image_id);
43 efl_file_set(event->object, path, NULL); 43 efl_file_set(event->object, path, NULL);
44 return EO_CALLBACK_CONTINUE;
45} 44}
46 45
47static Eina_Bool 46static void
48_async_opened_cb(void *data, const Eo_Event *event) 47_async_opened_cb(void *data, const Eo_Event *event)
49{ 48{
50 Test_Data *td = data; 49 Test_Data *td = data;
@@ -63,7 +62,7 @@ _async_opened_cb(void *data, const Eo_Event *event)
63 td->image_id++; 62 td->image_id++;
64 sprintf(path, pathfmt, td->image_id); 63 sprintf(path, pathfmt, td->image_id);
65 efl_file_set(event->object, path, NULL); 64 efl_file_set(event->object, path, NULL);
66 return EO_CALLBACK_CONTINUE; 65 return;
67 } 66 }
68 else if (td->image_id < MAX_IMAGE_ID) 67 else if (td->image_id < MAX_IMAGE_ID)
69 { 68 {
@@ -73,13 +72,11 @@ _async_opened_cb(void *data, const Eo_Event *event)
73 sprintf(path, pathfmt, ++td->image_id); 72 sprintf(path, pathfmt, ++td->image_id);
74 efl_file_set(event->object, path, NULL); 73 efl_file_set(event->object, path, NULL);
75 } 74 }
76 return EO_CALLBACK_CONTINUE; 75 return;
77 } 76 }
78 77
79 td->success = 1; 78 td->success = 1;
80 ecore_main_loop_quit(); 79 ecore_main_loop_quit();
81
82 return EO_CALLBACK_CONTINUE;
83} 80}
84 81
85static Eina_Bool 82static Eina_Bool
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index 48b0535..f8ed415 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -56,7 +56,7 @@ struct _Frame_Data
56 Evas_Coord x, y; 56 Evas_Coord x, y;
57}; 57};
58 58
59static Eina_Bool bg_key_down(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED); 59static void bg_key_down(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED);
60 60
61 61
62static Evas_Object *o_bg = NULL; 62static Evas_Object *o_bg = NULL;
@@ -131,7 +131,7 @@ broadcast_event(Emotion_Event ev)
131 emotion_object_event_simple_send(obj, ev); 131 emotion_object_event_simple_send(obj, ev);
132} 132}
133 133
134static Eina_Bool 134static void
135bg_key_down(void *data EINA_UNUSED, const Eo_Event *event) 135bg_key_down(void *data EINA_UNUSED, const Eo_Event *event)
136{ 136{
137 Efl_Event_Key *ev = event->info; 137 Efl_Event_Key *ev = event->info;
@@ -139,7 +139,7 @@ bg_key_down(void *data EINA_UNUSED, const Eo_Event *event)
139 Evas_Object *o; 139 Evas_Object *o;
140 const char *keyname = efl_event_key_name_get(ev); 140 const char *keyname = efl_event_key_name_get(ev);
141 141
142 if (!keyname) return EO_CALLBACK_CONTINUE; 142 if (!keyname) return;
143 143
144 if (!strcmp(keyname, "Escape")) 144 if (!strcmp(keyname, "Escape"))
145 ecore_main_loop_quit(); 145 ecore_main_loop_quit();
@@ -288,15 +288,12 @@ bg_key_down(void *data EINA_UNUSED, const Eo_Event *event)
288 { 288 {
289 printf("UNHANDLED: %s\n", keyname); 289 printf("UNHANDLED: %s\n", keyname);
290 } 290 }
291
292 return EINA_TRUE;
293} 291}
294 292
295static Eina_Bool 293static void
296_oe_free_cb(void *data, const Eo_Event *event EINA_UNUSED) 294_oe_free_cb(void *data, const Eo_Event *event EINA_UNUSED)
297{ 295{
298 free(data); 296 free(data);
299 return EINA_TRUE;
300} 297}
301 298
302static void 299static void
@@ -326,7 +323,7 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje)
326 edje_obj_part_text_set(edje, "video_progress_txt", buf); 323 edje_obj_part_text_set(edje, "video_progress_txt", buf);
327} 324}
328 325
329static Eina_Bool 326static void
330video_obj_frame_decode_cb(void *data, const Eo_Event *event) 327video_obj_frame_decode_cb(void *data, const Eo_Event *event)
331{ 328{
332 video_obj_time_changed(event->object, data); 329 video_obj_time_changed(event->object, data);
@@ -339,10 +336,9 @@ video_obj_frame_decode_cb(void *data, const Eo_Event *event)
339 printf("FPS: %3.3f\n", 1.0 / (t - pt)); 336 printf("FPS: %3.3f\n", 1.0 / (t - pt));
340 pt = t; 337 pt = t;
341 } 338 }
342 return EINA_TRUE;
343} 339}
344 340
345static Eina_Bool 341static void
346video_obj_frame_resize_cb(void *data, const Eo_Event *event) 342video_obj_frame_resize_cb(void *data, const Eo_Event *event)
347{ 343{
348 Evas_Object *oe; 344 Evas_Object *oe;
@@ -361,29 +357,23 @@ video_obj_frame_resize_cb(void *data, const Eo_Event *event)
361 efl_gfx_size_set(oe, w, h); 357 efl_gfx_size_set(oe, w, h);
362 evas_object_size_hint_min_set(event->object, 0, 0); 358 evas_object_size_hint_min_set(event->object, 0, 0);
363 edje_object_part_swallow(oe, "video_swallow", event->object); 359 edje_object_part_swallow(oe, "video_swallow", event->object);
364
365 return EINA_TRUE;
366} 360}
367 361
368static Eina_Bool 362static void
369video_obj_length_change_cb(void *data, const Eo_Event *event) 363video_obj_length_change_cb(void *data, const Eo_Event *event)
370{ 364{
371 printf("len change!\n"); 365 printf("len change!\n");
372 video_obj_time_changed(event->object, data); 366 video_obj_time_changed(event->object, data);
373
374 return EINA_TRUE;
375} 367}
376 368
377static Eina_Bool 369static void
378video_obj_position_update_cb(void *data, const Eo_Event *event) 370video_obj_position_update_cb(void *data, const Eo_Event *event)
379{ 371{
380 printf("pos up!\n"); 372 printf("pos up!\n");
381 video_obj_time_changed(event->object, data); 373 video_obj_time_changed(event->object, data);
382
383 return EINA_TRUE;
384} 374}
385 375
386static Eina_Bool 376static void
387video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event) 377video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event)
388{ 378{
389 printf("video stopped!!!\n"); 379 printf("video stopped!!!\n");
@@ -392,65 +382,51 @@ video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event)
392 emotion_object_position_set(event->object, 0.0); 382 emotion_object_position_set(event->object, 0.0);
393 emotion_object_play_set(event->object, EINA_TRUE); 383 emotion_object_play_set(event->object, EINA_TRUE);
394 } 384 }
395
396 return EINA_TRUE;
397} 385}
398 386
399static Eina_Bool 387static void
400video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event) 388video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event)
401{ 389{
402 printf("channels changed: [AUD %i][VID %i][SPU %i]\n", 390 printf("channels changed: [AUD %i][VID %i][SPU %i]\n",
403 emotion_object_audio_channel_count(event->object), 391 emotion_object_audio_channel_count(event->object),
404 emotion_object_video_channel_count(event->object), 392 emotion_object_video_channel_count(event->object),
405 emotion_object_spu_channel_count(event->object)); 393 emotion_object_spu_channel_count(event->object));
406
407 return EINA_TRUE;
408} 394}
409 395
410static Eina_Bool 396static void
411 video_obj_title_cb(void *data EINA_UNUSED, const Eo_Event *event) 397 video_obj_title_cb(void *data EINA_UNUSED, const Eo_Event *event)
412{ 398{
413 printf("video title to: \"%s\"\n", emotion_object_title_get(event->object)); 399 printf("video title to: \"%s\"\n", emotion_object_title_get(event->object));
414
415 return EINA_TRUE;
416} 400}
417 401
418static Eina_Bool 402static void
419video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event) 403video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event)
420{ 404{
421 printf("progress: \"%s\" %3.3f\n", 405 printf("progress: \"%s\" %3.3f\n",
422 emotion_object_progress_info_get(event->object), 406 emotion_object_progress_info_get(event->object),
423 emotion_object_progress_status_get(event->object)); 407 emotion_object_progress_status_get(event->object));
424
425 return EINA_TRUE;
426} 408}
427 409
428static Eina_Bool 410static void
429video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event) 411video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event)
430{ 412{
431 printf("video ref to: \"%s\" %i\n", 413 printf("video ref to: \"%s\" %i\n",
432 emotion_object_ref_file_get(event->object), 414 emotion_object_ref_file_get(event->object),
433 emotion_object_ref_num_get(event->object)); 415 emotion_object_ref_num_get(event->object));
434
435 return EINA_TRUE;
436} 416}
437 417
438static Eina_Bool 418static void
439video_obj_button_num_cb(void *data EINA_UNUSED, const Eo_Event *event) 419video_obj_button_num_cb(void *data EINA_UNUSED, const Eo_Event *event)
440{ 420{
441 printf("video spu buttons to: %i\n", 421 printf("video spu buttons to: %i\n",
442 emotion_object_spu_button_count_get(event->object)); 422 emotion_object_spu_button_count_get(event->object));
443
444 return EINA_TRUE;
445} 423}
446 424
447static Eina_Bool 425static void
448video_obj_button_cb(void *data EINA_UNUSED, const Eo_Event *event) 426video_obj_button_cb(void *data EINA_UNUSED, const Eo_Event *event)
449{ 427{
450 printf("video selected spu button: %i\n", 428 printf("video selected spu button: %i\n",
451 emotion_object_spu_button_get(event->object)); 429 emotion_object_spu_button_get(event->object));
452
453 return EINA_TRUE;
454} 430}
455 431
456static void 432static void
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index bec7fcb..c745f6c 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -10,15 +10,13 @@
10 10
11static int cb_called = EINA_FALSE; 11static int cb_called = EINA_FALSE;
12 12
13static Eina_Bool 13static void
14_a_changed_cb(void *data, const Eo_Event *event) 14_a_changed_cb(void *data, const Eo_Event *event)
15{ 15{
16 int new_a = *((int *) event->info); 16 int new_a = *((int *) event->info);
17 printf("%s event_info:'%d' data:'%s'\n", __func__, new_a, (const char *) data); 17 printf("%s event_info:'%d' data:'%s'\n", __func__, new_a, (const char *) data);
18 18
19 cb_called = EINA_TRUE; 19 cb_called = EINA_TRUE;
20
21 return EO_CALLBACK_CONTINUE;
22} 20}
23 21
24int 22int
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index 5c33bc5..dce0d0ee 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -9,13 +9,12 @@
9 9
10static int cb_count = 0; 10static int cb_count = 0;
11 11
12static Eina_Bool 12static void
13_null_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 13_null_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
14{ 14{
15 return EO_CALLBACK_CONTINUE;
16} 15}
17 16
18static Eina_Bool 17static void
19_a_changed_cb(void *data, const Eo_Event *event) 18_a_changed_cb(void *data, const Eo_Event *event)
20{ 19{
21 int new_a = *((int *) event->info); 20 int new_a = *((int *) event->info);
@@ -27,22 +26,23 @@ _a_changed_cb(void *data, const Eo_Event *event)
27 eo_event_callback_del(event->object, EV_A_CHANGED, _null_cb, (void *) 23423); 26 eo_event_callback_del(event->object, EV_A_CHANGED, _null_cb, (void *) 23423);
28 27
29 /* Stop as we reached the 3rd one. */ 28 /* Stop as we reached the 3rd one. */
30 return (cb_count != 3); 29 if (cb_count == 3)
30 eo_event_callback_stop(event->object);
31} 31}
32 32
33static Eina_Bool inside = EINA_FALSE; 33static Eina_Bool inside = EINA_FALSE;
34static int called = 0; 34static int called = 0;
35 35
36static Eina_Bool 36static void
37_restart_1_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 37_restart_1_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
38{ 38{
39 fprintf(stderr, "restart 1 inside: %i\n", inside); 39 fprintf(stderr, "restart 1 inside: %i\n", inside);
40 fail_if(!inside); 40 fail_if(!inside);
41 called++; 41 called++;
42 return EINA_FALSE; 42 eo_event_callback_stop(event->object);
43} 43}
44 44
45static Eina_Bool 45static void
46_restart_2_cb(void *data, const Eo_Event *event) 46_restart_2_cb(void *data, const Eo_Event *event)
47{ 47{
48 fprintf(stderr, "restart 2 inside: %i\n", inside); 48 fprintf(stderr, "restart 2 inside: %i\n", inside);
@@ -55,7 +55,7 @@ _restart_2_cb(void *data, const Eo_Event *event)
55 called++; 55 called++;
56 56
57 fprintf(stderr, "restart 2 exit inside: %i (%i)\n", inside, called); 57 fprintf(stderr, "restart 2 exit inside: %i (%i)\n", inside, called);
58 return EINA_FALSE; 58 eo_event_callback_stop(event->object);
59} 59}
60 60
61int 61int
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index f7cad68..508dbcf 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -28,34 +28,32 @@ _a_set(Eo *obj, void *class_data, int a)
28 eo_event_callback_call(obj, EV_A_CHANGED, &pd->a); 28 eo_event_callback_call(obj, EV_A_CHANGED, &pd->a);
29} 29}
30 30
31Eina_Bool 31void
32_cb_added(void *data EINA_UNUSED, const Eo_Event *event) 32_cb_added(void *data EINA_UNUSED, const Eo_Event *event)
33{ 33{
34 Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS); 34 Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS);
35 const Eo_Callback_Array_Item *callback_array = event->info; 35 const Eo_Callback_Array_Item *callback_array = event->info;
36 36
37 if (callback_array->desc != EV_A_CHANGED) 37 if (callback_array->desc != EV_A_CHANGED)
38 return EINA_TRUE; 38 return;
39 39
40 pd->cb_count++; 40 pd->cb_count++;
41 41
42 printf("Added EV_A_CHANGED callback to %p. Count: %d\n", event->object, pd->cb_count); 42 printf("Added EV_A_CHANGED callback to %p. Count: %d\n", event->object, pd->cb_count);
43 return EO_CALLBACK_CONTINUE;
44} 43}
45 44
46Eina_Bool 45void
47_cb_deled(void *data EINA_UNUSED, const Eo_Event *event) 46_cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
48{ 47{
49 Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS); 48 Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS);
50 const Eo_Callback_Array_Item *callback_array = event->info; 49 const Eo_Callback_Array_Item *callback_array = event->info;
51 50
52 if (callback_array->desc != EV_A_CHANGED) 51 if (callback_array->desc != EV_A_CHANGED)
53 return EINA_TRUE; 52 return;
54 53
55 pd->cb_count--; 54 pd->cb_count--;
56 55
57 printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", event->object, pd->cb_count); 56 printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", event->object, pd->cb_count);
58 return EO_CALLBACK_CONTINUE;
59} 57}
60 58
61static Eo * 59static Eo *
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index f7c8962..51d0d67 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -113,39 +113,36 @@ END_TEST
113static int _eo_signals_cb_current = 0; 113static int _eo_signals_cb_current = 0;
114static int _eo_signals_cb_flag = 0; 114static int _eo_signals_cb_flag = 0;
115 115
116static Eina_Bool 116static void
117_eo_signals_a_changed_cb(void *_data, const Eo_Event *event EINA_UNUSED) 117_eo_signals_a_changed_cb(void *_data, const Eo_Event *event EINA_UNUSED)
118{ 118{
119 int data = (intptr_t) _data; 119 int data = (intptr_t) _data;
120 _eo_signals_cb_current++; 120 _eo_signals_cb_current++;
121 ck_assert_int_eq(data, _eo_signals_cb_current); 121 ck_assert_int_eq(data, _eo_signals_cb_current);
122 _eo_signals_cb_flag |= 0x1; 122 _eo_signals_cb_flag |= 0x1;
123 return EO_CALLBACK_CONTINUE;
124} 123}
125 124
126static Eina_Bool 125static void
127_eo_signals_a_changed_cb2(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 126_eo_signals_a_changed_cb2(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
128{ 127{
129 _eo_signals_cb_flag |= 0x2; 128 _eo_signals_cb_flag |= 0x2;
130 return EO_CALLBACK_STOP; 129 eo_event_callback_stop(event->object);
131} 130}
132 131
133static Eina_Bool 132static void
134_eo_signals_a_changed_never(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 133_eo_signals_a_changed_never(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
135{ 134{
136 /* This one should never be called. */ 135 /* This one should never be called. */
137 fail_if(1); 136 fail_if(1);
138 return EO_CALLBACK_CONTINUE;
139} 137}
140 138
141static Eina_Bool 139static void
142_eo_signals_eo_del_cb(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 140_eo_signals_eo_del_cb(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
143{ 141{
144 _eo_signals_cb_flag |= 0x4; 142 _eo_signals_cb_flag |= 0x4;
145 return EO_CALLBACK_CONTINUE;
146} 143}
147 144
148Eina_Bool 145void
149_eo_signals_cb_added_deled(void *data, const Eo_Event *event) 146_eo_signals_cb_added_deled(void *data, const Eo_Event *event)
150{ 147{
151 const Eo_Callback_Array_Item *callback_array = event->info; 148 const Eo_Callback_Array_Item *callback_array = event->info;
@@ -153,8 +150,6 @@ _eo_signals_cb_added_deled(void *data, const Eo_Event *event)
153 150
154 fail_if((callback_data() != callback_array) && 151 fail_if((callback_data() != callback_array) &&
155 (callback_array->func != _eo_signals_cb_added_deled)); 152 (callback_array->func != _eo_signals_cb_added_deled));
156
157 return EO_CALLBACK_CONTINUE;
158} 153}
159 154
160EO_CALLBACKS_ARRAY_DEFINE(_eo_signals_callbacks, 155EO_CALLBACKS_ARRAY_DEFINE(_eo_signals_callbacks,
diff --git a/src/tests/eolian/data/typedef_ref.c b/src/tests/eolian/data/typedef_ref.c
index 6f07d3a..14d0dfd 100644
--- a/src/tests/eolian/data/typedef_ref.c
+++ b/src/tests/eolian/data/typedef_ref.c
@@ -19,7 +19,7 @@ typedef Evas_Coord Evas_Coord2;
19 19
20typedef Evas_Coord2 Evas_Coord3; 20typedef Evas_Coord2 Evas_Coord3;
21 21
22typedef Eina_Bool (*Event)(void *data, const Eo_Event *event); 22typedef void (*Event)(void *data, const Eo_Event *event);
23 23
24typedef enum 24typedef enum
25{ 25{
diff --git a/src/tests/eolian/data/typedef_ref_stub.c b/src/tests/eolian/data/typedef_ref_stub.c
index 9ba5294..033d5da 100644
--- a/src/tests/eolian/data/typedef_ref_stub.c
+++ b/src/tests/eolian/data/typedef_ref_stub.c
@@ -11,7 +11,7 @@ typedef Evas_Coord Evas_Coord2;
11 11
12typedef Evas_Coord2 Evas_Coord3; 12typedef Evas_Coord2 Evas_Coord3;
13 13
14typedef Eina_Bool (*Event)(void *data, const Eo_Event *event); 14typedef void (*Event)(void *data, const Eo_Event *event);
15 15
16 16
17#endif 17#endif