summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c8
-rw-r--r--src/tests/eio/eio_model_test_file.c24
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c26
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c11
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c86
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c6
-rw-r--r--src/tests/eo/signals/signals_main.c16
-rw-r--r--src/tests/eo/signals/signals_simple.c20
-rw-r--r--src/tests/eo/suite/eo_test_general.c12
9 files changed, 89 insertions, 120 deletions
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 5bceee28ae..fe2f325434 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, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 14static Eina_Bool _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
@@ -25,16 +25,16 @@ static Eina_Bool _failed_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Desc
25 return EINA_TRUE; 25 return EINA_TRUE;
26} 26}
27 27
28static Eina_Bool _finished_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 28static Eina_Bool _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
29{ 29{
30 ecore_main_loop_quit(); 30 ecore_main_loop_quit();
31 31
32 return EINA_TRUE; 32 return EINA_TRUE;
33} 33}
34 34
35static Eina_Bool _looped_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 35static Eina_Bool _looped_cb(void *data EINA_UNUSED, const Eo_Event *event)
36{ 36{
37 eo_do(obj, ecore_audio_obj_in_looped_set(EINA_FALSE)); 37 eo_do(event->obj, ecore_audio_obj_in_looped_set(EINA_FALSE));
38 38
39 return EINA_TRUE; 39 return EINA_TRUE;
40} 40}
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index c6aa8d8639..56e6dd6ac8 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -59,9 +59,9 @@ static Eina_Bool
59 } 59 }
60 60
61static Eina_Bool 61static Eina_Bool
62_load_status_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 62_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
63{ 63{
64 Efl_Model_Load *st = event_info; 64 Efl_Model_Load *st = event->event_info;
65 printf("Load CHANGE\n"); 65 printf("Load CHANGE\n");
66 66
67 if (st->status & EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN) 67 if (st->status & EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN)
@@ -84,26 +84,26 @@ _load_status_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *des
84 char *str; 84 char *str;
85 85
86 printf("Model is Loaded\n"); 86 printf("Model is Loaded\n");
87 eo_do(obj, status = efl_model_property_get("filename", &value_prop)); 87 eo_do(event->obj, status = efl_model_property_get("filename", &value_prop));
88 str = eina_value_to_string(value_prop); 88 str = eina_value_to_string(value_prop);
89 printf("efl_model_loaded filename %s, status=%d\n", str, status); 89 printf("efl_model_loaded filename %s, status=%d\n", str, status);
90 free(str); 90 free(str);
91 91
92 eo_do(obj, status = efl_model_property_get("size", &value_prop)); 92 eo_do(event->obj, status = efl_model_property_get("size", &value_prop));
93 str = eina_value_to_string(value_prop); 93 str = eina_value_to_string(value_prop);
94 printf("efl_model_loaded size %s, status=%d\n", str, status); 94 printf("efl_model_loaded size %s, status=%d\n", str, status);
95 free(str); 95 free(str);
96 96
97 eo_do(obj, status = efl_model_property_get("mtime", &value_prop)); 97 eo_do(event->obj, status = efl_model_property_get("mtime", &value_prop));
98 str = eina_value_to_string(value_prop); 98 str = eina_value_to_string(value_prop);
99 printf("efl_model_loaded mtime %s, status=%d\n", str, status); 99 printf("efl_model_loaded mtime %s, status=%d\n", str, status);
100 free(str); 100 free(str);
101 101
102 eo_do(obj, efl_model_children_count_get(&total)); 102 eo_do(event->obj, efl_model_children_count_get(&total));
103 printf("efl_model_test count %d\n", (int)total); 103 printf("efl_model_test count %d\n", (int)total);
104 104
105 /**< get full list */ 105 /**< get full list */
106 eo_do(obj, status = efl_model_children_slice_get(0 ,0 ,(Eina_Accessor **)&accessor)); 106 eo_do(event->obj, status = efl_model_children_slice_get(0 ,0 ,(Eina_Accessor **)&accessor));
107 eina_accessor_free(accessor); 107 eina_accessor_free(accessor);
108 ecore_main_loop_quit(); 108 ecore_main_loop_quit();
109 } 109 }
@@ -111,9 +111,9 @@ _load_status_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *des
111} 111}
112 112
113static Eina_Bool 113static Eina_Bool
114_properties_change_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 114_properties_change_cb(void *data EINA_UNUSED, const Eo_Event *event)
115{ 115{
116 const Efl_Model_Property_Event *evt = (Efl_Model_Property_Event *)event_info; 116 const Efl_Model_Property_Event *evt = (Efl_Model_Property_Event *)event->event_info;
117 const char *prop; 117 const char *prop;
118 Eina_Array_Iterator it; 118 Eina_Array_Iterator it;
119 unsigned int i; 119 unsigned int i;
@@ -135,15 +135,15 @@ _properties_change_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Even
135} 135}
136 136
137static Eina_Bool 137static Eina_Bool
138_children_count_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 138_children_count_cb(void *data EINA_UNUSED, const Eo_Event *event)
139{ 139{
140 unsigned int *len = (unsigned int *)event_info; 140 unsigned int *len = (unsigned int *)event->event_info;
141 unsigned int total; 141 unsigned int total;
142 142
143 fprintf(stdout, "Children count number=%d\n", *len); 143 fprintf(stdout, "Children count number=%d\n", *len);
144 reqs.children = *len; 144 reqs.children = *len;
145 145
146 eo_do(obj, efl_model_children_count_get(&total)); 146 eo_do(event->obj, efl_model_children_count_get(&total));
147 fprintf(stdout, "New total children count number=%d\n", *len); 147 fprintf(stdout, "New total children count number=%d\n", *len);
148 148
149 return EINA_TRUE; 149 return EINA_TRUE;
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index a0ad69ef7d..4f26a8e675 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -19,9 +19,9 @@ Eina_Tmpstr* temp_filename = NULL;
19const char* tmpdir = NULL; 19const char* tmpdir = NULL;
20 20
21static Eina_Bool 21static Eina_Bool
22_load_monitor_status_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 22_load_monitor_status_cb(void *data, const Eo_Event *event)
23{ 23{
24 Efl_Model_Load* st = event_info; 24 Efl_Model_Load* st = event->event_info;
25 Eo* parent = data; 25 Eo* parent = data;
26 const Eina_Value* value_prop = NULL; 26 const Eina_Value* value_prop = NULL;
27 const char* str = NULL; 27 const char* str = NULL;
@@ -29,7 +29,7 @@ _load_monitor_status_cb(void *data, Eo *obj, const Eo_Event_Description *desc EI
29 if (!(st->status & EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES)) 29 if (!(st->status & EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES))
30 return EINA_TRUE; 30 return EINA_TRUE;
31 31
32 eo_do(obj, efl_model_property_get("path", &value_prop)); 32 eo_do(event->obj, efl_model_property_get("path", &value_prop));
33 fail_if(!value_prop, "ERROR: Cannot get property!\n"); 33 fail_if(!value_prop, "ERROR: Cannot get property!\n");
34 34
35 str = eina_value_to_string(value_prop); 35 str = eina_value_to_string(value_prop);
@@ -38,20 +38,20 @@ _load_monitor_status_cb(void *data, Eo *obj, const Eo_Event_Description *desc EI
38 if(temp_filename && strcmp(str, temp_filename) == 0) 38 if(temp_filename && strcmp(str, temp_filename) == 0)
39 { 39 {
40 fprintf(stderr, "is child that we want\n"); 40 fprintf(stderr, "is child that we want\n");
41 eo_do(obj, eo_event_callback_del(EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_monitor_status_cb, data)); 41 eo_do(event->obj, eo_event_callback_del(EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_monitor_status_cb, data));
42 children_added = EINA_TRUE; 42 children_added = EINA_TRUE;
43 eo_do(parent, efl_model_child_del(obj)); 43 eo_do(parent, efl_model_child_del(event->obj));
44 } 44 }
45 45
46 return EINA_FALSE; 46 return EINA_FALSE;
47} 47}
48 48
49static Eina_Bool 49static Eina_Bool
50_children_removed_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void* event_info EINA_UNUSED) 50_children_removed_cb(void *data EINA_UNUSED, const Eo_Event *event)
51{ 51{
52 if(children_added) 52 if(children_added)
53 { 53 {
54 Efl_Model_Children_Event* evt = event_info; 54 Efl_Model_Children_Event* evt = event->event_info;
55 55
56 Eina_Bool b; 56 Eina_Bool b;
57 eo_do(evt->child, b = efl_model_load_status_get() & EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES); 57 eo_do(evt->child, b = efl_model_load_status_get() & EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES);
@@ -73,22 +73,22 @@ _children_removed_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event
73} 73}
74 74
75static Eina_Bool 75static Eina_Bool
76_children_added_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 76_children_added_cb(void *data EINA_UNUSED, const Eo_Event *event)
77{ 77{
78 Efl_Model_Children_Event* evt = event_info; 78 Efl_Model_Children_Event* evt = event->event_info;
79 if (evt == NULL) 79 if (evt == NULL)
80 return EINA_TRUE; 80 return EINA_TRUE;
81 81
82 eo_do(evt->child, eo_event_callback_add(EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_monitor_status_cb, obj)); 82 eo_do(evt->child, eo_event_callback_add(EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_monitor_status_cb, event->obj));
83 eo_do(evt->child, efl_model_load()); 83 eo_do(evt->child, efl_model_load());
84 84
85 return EINA_TRUE; 85 return EINA_TRUE;
86} 86}
87 87
88static Eina_Bool 88static Eina_Bool
89_children_count_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 89_children_count_cb(void *data EINA_UNUSED, const Eo_Event *event)
90{ 90{
91 unsigned int *len = event_info; 91 unsigned int *len = event->event_info;
92 Eina_Accessor *accessor; 92 Eina_Accessor *accessor;
93 Efl_Model_Load_Status status; 93 Efl_Model_Load_Status status;
94 Eo *child; 94 Eo *child;
@@ -98,7 +98,7 @@ _children_count_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *
98 fprintf(stderr, "Children count number=%d\n", *len); 98 fprintf(stderr, "Children count number=%d\n", *len);
99 99
100 /**< get full list */ 100 /**< get full list */
101 eo_do(obj, status = efl_model_children_slice_get(0 ,0 ,(Eina_Accessor **)&accessor)); 101 eo_do(event->obj, status = efl_model_children_slice_get(0 ,0 ,(Eina_Accessor **)&accessor));
102 if(accessor != NULL) 102 if(accessor != NULL)
103 { 103 {
104 EINA_ACCESSOR_FOREACH(accessor, i, child) {} 104 EINA_ACCESSOR_FOREACH(accessor, i, child) {}
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index 771d942948..adba9f5802 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -15,10 +15,7 @@
15#include "eldbus_suite.h" 15#include "eldbus_suite.h"
16 16
17static Eina_Bool 17static Eina_Bool
18_eo_event_quit_cb(void *data EINA_UNUSED, 18_eo_event_quit_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
19 Eo *obj EINA_UNUSED,
20 const Eo_Event_Description *desc EINA_UNUSED,
21 void *event_info EINA_UNUSED)
22{ 19{
23 ecore_main_loop_quit(); 20 ecore_main_loop_quit();
24 return EINA_FALSE; 21 return EINA_FALSE;
@@ -33,13 +30,11 @@ efl_model_wait_for_event(Eo *obj, const Eo_Event_Description* event)
33} 30}
34 31
35static Eina_Bool 32static Eina_Bool
36_event_load_status_quit_cb(void *data, Eo *obj EINA_UNUSED, 33_event_load_status_quit_cb(void *data, const Eo_Event *event)
37 const Eo_Event_Description *desc EINA_UNUSED,
38 void *event_info EINA_UNUSED)
39{ 34{
40 printf("_event_load_status_quit_cb\n"); 35 printf("_event_load_status_quit_cb\n");
41 Efl_Model_Load_Status expected_status = (Efl_Model_Load_Status)data; 36 Efl_Model_Load_Status expected_status = (Efl_Model_Load_Status)data;
42 Efl_Model_Load *actual_load = (Efl_Model_Load*)event_info; 37 Efl_Model_Load *actual_load = (Efl_Model_Load*)event->event_info;
43 38
44 if (expected_status == actual_load->status) 39 if (expected_status == actual_load->status)
45 { 40 {
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index efa9d3c8ea..4efbfc988b 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -56,8 +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, Eo *obj EINA_UNUSED, 59static Eina_Bool bg_key_down(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED);
60 const Eo_Event_Description *desc EINA_UNUSED, void *event_info);
61 60
62 61
63static Evas_Object *o_bg = NULL; 62static Evas_Object *o_bg = NULL;
@@ -136,10 +135,9 @@ broadcast_event(Emotion_Event ev)
136} 135}
137 136
138static Eina_Bool 137static Eina_Bool
139bg_key_down(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, 138bg_key_down(void *data EINA_UNUSED, const Eo_Event *event)
140 const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
141{ 139{
142 Evas_Event_Key_Down *ev = event_info; 140 Evas_Event_Key_Down *ev = event->event_info;
143 Eina_List *l; 141 Eina_List *l;
144 Evas_Object *o; 142 Evas_Object *o;
145 143
@@ -295,8 +293,7 @@ bg_key_down(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
295} 293}
296 294
297static Eina_Bool 295static Eina_Bool
298_oe_free_cb(void *data, 296_oe_free_cb(void *data, const Eo_Event *event EINA_UNUSED)
299 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
300{ 297{
301 free(data); 298 free(data);
302 return EINA_TRUE; 299 return EINA_TRUE;
@@ -330,10 +327,9 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje)
330} 327}
331 328
332static Eina_Bool 329static Eina_Bool
333video_obj_frame_decode_cb(void *data, 330video_obj_frame_decode_cb(void *data, const Eo_Event *event)
334 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
335{ 331{
336 video_obj_time_changed(obj, data); 332 video_obj_time_changed(event->obj, data);
337 333
338 if (0) 334 if (0)
339 { 335 {
@@ -347,8 +343,7 @@ video_obj_frame_decode_cb(void *data,
347} 343}
348 344
349static Eina_Bool 345static Eina_Bool
350video_obj_frame_resize_cb(void *data, 346video_obj_frame_resize_cb(void *data, const Eo_Event *event)
351 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
352{ 347{
353 Evas_Object *oe; 348 Evas_Object *oe;
354 int iw, ih; 349 int iw, ih;
@@ -356,114 +351,105 @@ video_obj_frame_resize_cb(void *data,
356 double ratio; 351 double ratio;
357 352
358 oe = data; 353 oe = data;
359 emotion_object_size_get(obj, &iw, &ih); 354 emotion_object_size_get(event->obj, &iw, &ih);
360 ratio = emotion_object_ratio_get(obj); 355 ratio = emotion_object_ratio_get(event->obj);
361 printf("HANDLE %ix%i @ %3.3f\n", iw, ih, ratio); 356 printf("HANDLE %ix%i @ %3.3f\n", iw, ih, ratio);
362 if (ratio > 0.0) iw = (ih * ratio) + 0.5; 357 if (ratio > 0.0) iw = (ih * ratio) + 0.5;
363 evas_object_size_hint_min_set(obj, iw, ih); 358 evas_object_size_hint_min_set(event->obj, iw, ih);
364 eo_do(oe, edje_obj_part_swallow( "video_swallow", obj), 359 eo_do(oe, edje_obj_part_swallow( "video_swallow", event->obj),
365 edje_obj_size_min_calc(&w, &h), 360 edje_obj_size_min_calc(&w, &h),
366 efl_gfx_size_set(w, h) 361 efl_gfx_size_set(w, h)
367 ); 362 );
368 eo_do(obj, evas_obj_size_hint_min_set(0, 0)); 363 eo_do(event->obj, evas_obj_size_hint_min_set(0, 0));
369 eo_do(oe, edje_obj_part_swallow( "video_swallow", obj)); 364 eo_do(oe, edje_obj_part_swallow( "video_swallow", event->obj));
370 365
371 return EINA_TRUE; 366 return EINA_TRUE;
372} 367}
373 368
374static Eina_Bool 369static Eina_Bool
375video_obj_length_change_cb(void *data, 370video_obj_length_change_cb(void *data, const Eo_Event *event)
376 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
377{ 371{
378 printf("len change!\n"); 372 printf("len change!\n");
379 video_obj_time_changed(obj, data); 373 video_obj_time_changed(event->obj, data);
380 374
381 return EINA_TRUE; 375 return EINA_TRUE;
382} 376}
383 377
384static Eina_Bool 378static Eina_Bool
385video_obj_position_update_cb(void *data, 379video_obj_position_update_cb(void *data, const Eo_Event *event)
386 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
387{ 380{
388 printf("pos up!\n"); 381 printf("pos up!\n");
389 video_obj_time_changed(obj, data); 382 video_obj_time_changed(event->obj, data);
390 383
391 return EINA_TRUE; 384 return EINA_TRUE;
392} 385}
393 386
394static Eina_Bool 387static Eina_Bool
395video_obj_stopped_cb(void *data EINA_UNUSED, 388video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event)
396 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
397{ 389{
398 printf("video stopped!!!\n"); 390 printf("video stopped!!!\n");
399 if (loop) 391 if (loop)
400 { 392 {
401 emotion_object_position_set(obj, 0.0); 393 emotion_object_position_set(event->obj, 0.0);
402 emotion_object_play_set(obj, EINA_TRUE); 394 emotion_object_play_set(event->obj, EINA_TRUE);
403 } 395 }
404 396
405 return EINA_TRUE; 397 return EINA_TRUE;
406} 398}
407 399
408static Eina_Bool 400static Eina_Bool
409video_obj_channels_cb(void *data EINA_UNUSED, 401video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event)
410 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
411{ 402{
412 printf("channels changed: [AUD %i][VID %i][SPU %i]\n", 403 printf("channels changed: [AUD %i][VID %i][SPU %i]\n",
413 emotion_object_audio_channel_count(obj), 404 emotion_object_audio_channel_count(event->obj),
414 emotion_object_video_channel_count(obj), 405 emotion_object_video_channel_count(event->obj),
415 emotion_object_spu_channel_count(obj)); 406 emotion_object_spu_channel_count(event->obj));
416 407
417 return EINA_TRUE; 408 return EINA_TRUE;
418} 409}
419 410
420static Eina_Bool 411static Eina_Bool
421 video_obj_title_cb(void *data EINA_UNUSED, 412 video_obj_title_cb(void *data EINA_UNUSED, const Eo_Event *event)
422 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
423{ 413{
424 printf("video title to: \"%s\"\n", emotion_object_title_get(obj)); 414 printf("video title to: \"%s\"\n", emotion_object_title_get(event->obj));
425 415
426 return EINA_TRUE; 416 return EINA_TRUE;
427} 417}
428 418
429static Eina_Bool 419static Eina_Bool
430video_obj_progress_cb(void *data EINA_UNUSED, 420video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event)
431 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
432{ 421{
433 printf("progress: \"%s\" %3.3f\n", 422 printf("progress: \"%s\" %3.3f\n",
434 emotion_object_progress_info_get(obj), 423 emotion_object_progress_info_get(event->obj),
435 emotion_object_progress_status_get(obj)); 424 emotion_object_progress_status_get(event->obj));
436 425
437 return EINA_TRUE; 426 return EINA_TRUE;
438} 427}
439 428
440static Eina_Bool 429static Eina_Bool
441video_obj_ref_cb(void *data EINA_UNUSED, 430video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event)
442 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
443{ 431{
444 printf("video ref to: \"%s\" %i\n", 432 printf("video ref to: \"%s\" %i\n",
445 emotion_object_ref_file_get(obj), 433 emotion_object_ref_file_get(event->obj),
446 emotion_object_ref_num_get(obj)); 434 emotion_object_ref_num_get(event->obj));
447 435
448 return EINA_TRUE; 436 return EINA_TRUE;
449} 437}
450 438
451static Eina_Bool 439static Eina_Bool
452video_obj_button_num_cb(void *data EINA_UNUSED, 440video_obj_button_num_cb(void *data EINA_UNUSED, const Eo_Event *event)
453 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
454{ 441{
455 printf("video spu buttons to: %i\n", 442 printf("video spu buttons to: %i\n",
456 emotion_object_spu_button_count_get(obj)); 443 emotion_object_spu_button_count_get(event->obj));
457 444
458 return EINA_TRUE; 445 return EINA_TRUE;
459} 446}
460 447
461static Eina_Bool 448static Eina_Bool
462video_obj_button_cb(void *data EINA_UNUSED, 449video_obj_button_cb(void *data EINA_UNUSED, const Eo_Event *event)
463 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
464{ 450{
465 printf("video selected spu button: %i\n", 451 printf("video selected spu button: %i\n",
466 emotion_object_spu_button_get(obj)); 452 emotion_object_spu_button_get(event->obj));
467 453
468 return EINA_TRUE; 454 return EINA_TRUE;
469} 455}
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index 6f78c9b114..5ad11c6ef5 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -13,11 +13,9 @@
13static int cb_called = EINA_FALSE; 13static int cb_called = EINA_FALSE;
14 14
15static Eina_Bool 15static Eina_Bool
16_a_changed_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info) 16_a_changed_cb(void *data, const Eo_Event *event)
17{ 17{
18 (void) desc; 18 int new_a = *((int *) event->event_info);
19 (void) obj;
20 int new_a = *((int *) event_info);
21 printf("%s event_info:'%d' data:'%s'\n", __func__, new_a, (const char *) data); 19 printf("%s event_info:'%d' data:'%s'\n", __func__, new_a, (const char *) data);
22 20
23 cb_called = EINA_TRUE; 21 cb_called = EINA_TRUE;
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index aadc34fcf6..4fcfaef2fe 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -10,27 +10,21 @@
10static int cb_count = 0; 10static int cb_count = 0;
11 11
12static Eina_Bool 12static Eina_Bool
13_null_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info) 13_null_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
14{ 14{
15 (void) desc;
16 (void) obj;
17 (void) data;
18 (void) event_info;
19 return EO_CALLBACK_CONTINUE; 15 return EO_CALLBACK_CONTINUE;
20} 16}
21 17
22static Eina_Bool 18static Eina_Bool
23_a_changed_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info) 19_a_changed_cb(void *data, const Eo_Event *event)
24{ 20{
25 (void) desc; 21 int new_a = *((int *) event->event_info);
26 (void) obj;
27 int new_a = *((int *) event_info);
28 printf("%s event_info:'%d' data:'%d'\n", __func__, new_a, (int) (intptr_t) data); 22 printf("%s event_info:'%d' data:'%d'\n", __func__, new_a, (int) (intptr_t) data);
29 23
30 cb_count++; 24 cb_count++;
31 25
32 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423)); 26 eo_do(event->obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423));
33 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _null_cb, (void *) 23423)); 27 eo_do(event->obj, eo_event_callback_del(EV_A_CHANGED, _null_cb, (void *) 23423));
34 28
35 /* Stop as we reached the 3rd one. */ 29 /* Stop as we reached the 3rd one. */
36 return (cb_count != 3); 30 return (cb_count != 3);
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index fd3138d44d..d3145e574e 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -27,36 +27,32 @@ _a_set(Eo *obj, void *class_data, int a)
27} 27}
28 28
29Eina_Bool 29Eina_Bool
30_cb_added(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info) 30_cb_added(void *data, const Eo_Event *event)
31{ 31{
32 Simple_Public_Data *pd = eo_data_scope_get(obj, MY_CLASS); 32 Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS);
33 const Eo_Callback_Array_Item *callback_array = event_info; 33 const Eo_Callback_Array_Item *callback_array = event->event_info;
34 (void) data;
35 (void) desc;
36 34
37 if (callback_array->desc != EV_A_CHANGED) 35 if (callback_array->desc != EV_A_CHANGED)
38 return EINA_TRUE; 36 return EINA_TRUE;
39 37
40 pd->cb_count++; 38 pd->cb_count++;
41 39
42 printf("Added EV_A_CHANGED callback to %p. Count: %d\n", obj, pd->cb_count); 40 printf("Added EV_A_CHANGED callback to %p. Count: %d\n", event->obj, pd->cb_count);
43 return EO_CALLBACK_CONTINUE; 41 return EO_CALLBACK_CONTINUE;
44} 42}
45 43
46Eina_Bool 44Eina_Bool
47_cb_deled(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info) 45_cb_deled(void *data, const Eo_Event *event)
48{ 46{
49 Simple_Public_Data *pd = eo_data_scope_get(obj, MY_CLASS); 47 Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS);
50 const Eo_Callback_Array_Item *callback_array = event_info; 48 const Eo_Callback_Array_Item *callback_array = event->event_info;
51 (void) data;
52 (void) desc;
53 49
54 if (callback_array->desc != EV_A_CHANGED) 50 if (callback_array->desc != EV_A_CHANGED)
55 return EINA_TRUE; 51 return EINA_TRUE;
56 52
57 pd->cb_count--; 53 pd->cb_count--;
58 54
59 printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", obj, pd->cb_count); 55 printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", event->obj, pd->cb_count);
60 return EO_CALLBACK_CONTINUE; 56 return EO_CALLBACK_CONTINUE;
61} 57}
62 58
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index f44538944a..6c85b3156a 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -48,7 +48,7 @@ static int _eo_signals_cb_current = 0;
48static int _eo_signals_cb_flag = 0; 48static int _eo_signals_cb_flag = 0;
49 49
50static Eina_Bool 50static Eina_Bool
51_eo_signals_a_changed_cb(void *_data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 51_eo_signals_a_changed_cb(void *_data, const Eo_Event *event EINA_UNUSED)
52{ 52{
53 int data = (intptr_t) _data; 53 int data = (intptr_t) _data;
54 _eo_signals_cb_current++; 54 _eo_signals_cb_current++;
@@ -58,14 +58,14 @@ _eo_signals_a_changed_cb(void *_data, Eo *obj EINA_UNUSED, const Eo_Event_Descri
58} 58}
59 59
60static Eina_Bool 60static Eina_Bool
61_eo_signals_a_changed_cb2(void *_data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 61_eo_signals_a_changed_cb2(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
62{ 62{
63 _eo_signals_cb_flag |= 0x2; 63 _eo_signals_cb_flag |= 0x2;
64 return EO_CALLBACK_STOP; 64 return EO_CALLBACK_STOP;
65} 65}
66 66
67static Eina_Bool 67static Eina_Bool
68_eo_signals_a_changed_never(void *_data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 68_eo_signals_a_changed_never(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
69{ 69{
70 /* This one should never be called. */ 70 /* This one should never be called. */
71 fail_if(1); 71 fail_if(1);
@@ -73,16 +73,16 @@ _eo_signals_a_changed_never(void *_data EINA_UNUSED, Eo *obj EINA_UNUSED, const
73} 73}
74 74
75static Eina_Bool 75static Eina_Bool
76_eo_signals_eo_del_cb(void *_data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 76_eo_signals_eo_del_cb(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
77{ 77{
78 _eo_signals_cb_flag |= 0x4; 78 _eo_signals_cb_flag |= 0x4;
79 return EO_CALLBACK_CONTINUE; 79 return EO_CALLBACK_CONTINUE;
80} 80}
81 81
82Eina_Bool 82Eina_Bool
83_eo_signals_cb_added_deled(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 83_eo_signals_cb_added_deled(void *data, const Eo_Event *event)
84{ 84{
85 const Eo_Callback_Array_Item *callback_array = event_info; 85 const Eo_Callback_Array_Item *callback_array = event->event_info;
86 86
87 fail_if((callback_array != data) && 87 fail_if((callback_array != data) &&
88 (callback_array->func != _eo_signals_cb_added_deled)); 88 (callback_array->func != _eo_signals_cb_added_deled));