summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-02-29 10:18:40 +0000
committerTom Hacohen <tom@stosb.com>2016-02-29 11:33:27 +0000
commite71e6561eeb5f0a10e5b08e44d2977e58bfd682b (patch)
tree72b41e7f6740360d265bbda572da5eb236c2e957
parent56ea371dfb064c28906c7d8344b0c0e03c1d3d4d (diff)
Eo callbacks: Migrate all of the EFL to the new event cb signatures.
Diffstat (limited to '')
-rw-r--r--src/benchmarks/eo/eo_bench_callbacks.c2
-rw-r--r--src/examples/ecore/ecore_audio_playback.c12
-rw-r--r--src/examples/ecore/ecore_audio_to_ogg.c8
-rw-r--r--src/examples/eo/evas/evas_test.c6
-rw-r--r--src/examples/evas/evas-3d-shadows.c12
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c14
-rw-r--r--src/lib/ecore_con/ecore_con_url.c18
-rw-r--r--src/lib/ecore_evas/ecore_evas.c14
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c2
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.c4
-rw-r--r--src/lib/edje/edje_callbacks.c59
-rw-r--r--src/lib/edje/edje_multisense.c8
-rw-r--r--src/lib/edje/edje_private.h2
-rw-r--r--src/lib/edje/edje_program.c3
-rw-r--r--src/lib/eo/eo_base_class.c4
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c12
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node_callback.h6
-rw-r--r--src/lib/evas/canvas/evas_clip.c6
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c4
-rw-r--r--src/lib/evas/canvas/evas_object_box.c8
-rw-r--r--src/lib/evas/canvas/evas_object_main.c21
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c4
-rw-r--r--src/lib/evas/canvas/evas_object_table.c6
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c6
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c5
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c6
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.c6
-rw-r--r--src/modules/ethumb/emotion/emotion.c9
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c5
-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
40 files changed, 210 insertions, 281 deletions
diff --git a/src/benchmarks/eo/eo_bench_callbacks.c b/src/benchmarks/eo/eo_bench_callbacks.c
index fde611eea1..5f675598f3 100644
--- a/src/benchmarks/eo/eo_bench_callbacks.c
+++ b/src/benchmarks/eo/eo_bench_callbacks.c
@@ -7,7 +7,7 @@
7#include "class_simple.h" 7#include "class_simple.h"
8 8
9static Eina_Bool 9static Eina_Bool
10_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 10_cb(void *data EINA_UNUSED, const Eo_Event *event)
11{ 11{
12 return EO_CALLBACK_CONTINUE; 12 return EO_CALLBACK_CONTINUE;
13} 13}
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index 78c98a366a..95ab90a612 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -191,17 +191,17 @@ 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, Eo *in, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 194static Eina_Bool _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;
198 198
199 eo_do(in, ecore_audio_obj_name_get(&name)); 199 eo_do(event->obj, ecore_audio_obj_name_get(&name));
200 printf("Done: %s\n", name); 200 printf("Done: %s\n", name);
201 201
202 inputs = eina_list_remove(inputs, in); 202 inputs = eina_list_remove(inputs, event->obj);
203 eo_do(out, ret = ecore_audio_obj_out_input_detach(in)); 203 eo_do(out, ret = ecore_audio_obj_out_input_detach(event->obj));
204 eo_del(in); 204 eo_del(event->obj);
205 205
206 if (!ret) 206 if (!ret)
207 printf("Could not detach input %s\n", name); 207 printf("Could not detach input %s\n", name);
@@ -210,7 +210,7 @@ static Eina_Bool _play_finished(void *data EINA_UNUSED, Eo *in, const Eo_Event_D
210 if (eina_list_count(inputs) > 0) 210 if (eina_list_count(inputs) > 0)
211 { 211 {
212 const char *name; 212 const char *name;
213 in = (Eo *)eina_list_data_get(inputs); 213 Eo *in = (Eo *)eina_list_data_get(inputs);
214 214
215 eo_do(in, ecore_audio_obj_name_get(&name)); 215 eo_do(in, ecore_audio_obj_name_get(&name));
216 printf("Start: %s\n", name); 216 printf("Start: %s\n", name);
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index 7048ed56c2..9d3162a0fe 100644
--- a/src/examples/ecore/ecore_audio_to_ogg.c
+++ b/src/examples/ecore/ecore_audio_to_ogg.c
@@ -15,16 +15,16 @@
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, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 18static Eina_Bool _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;
22 22
23 eo_do(obj, ecore_audio_obj_name_get(&name)); 23 eo_do(event->obj, ecore_audio_obj_name_get(&name));
24 printf("Done: %s\n", name); 24 printf("Done: %s\n", name);
25 25
26 eo_do(obj, ecore_audio_obj_in_output_get(&out)); 26 eo_do(event->obj, ecore_audio_obj_in_output_get(&out));
27 eo_del(obj); 27 eo_del(event->obj);
28 eo_del(out); 28 eo_del(out);
29 29
30 ecore_main_loop_quit(); 30 ecore_main_loop_quit();
diff --git a/src/examples/eo/evas/evas_test.c b/src/examples/eo/evas/evas_test.c
index 1502e31dd1..dca7a94ff3 100644
--- a/src/examples/eo/evas/evas_test.c
+++ b/src/examples/eo/evas/evas_test.c
@@ -11,11 +11,9 @@
11#include "evas_elw_win.h" 11#include "evas_elw_win.h"
12 12
13Eina_Bool 13Eina_Bool
14_btn_clicked_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info) 14_btn_clicked_cb(void *data, const Eo_Event *event)
15{ 15{
16 (void) obj; 16 const Eo_Class *klass = eo_class_get(event->obj);
17 (void) event_info;
18 const Eo_Class *klass = eo_class_get(obj);
19 printf("%s obj-type:'%s' data:'%s'\n", desc->name, eo_class_name_get(klass), (const char *) data); 17 printf("%s obj-type:'%s' data:'%s'\n", desc->name, eo_class_name_get(klass), (const char *) data);
20 18
21 return EO_CALLBACK_CONTINUE; 19 return EO_CALLBACK_CONTINUE;
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 179d1825cd..8fe1495d81 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -79,17 +79,17 @@ typedef struct _Scene_Data
79} Scene_Data; 79} Scene_Data;
80 80
81Eina_Bool 81Eina_Bool
82_cb_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 82_cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
83{ 83{
84 Eina_List *meshes = NULL, *l; 84 Eina_List *meshes = NULL, *l;
85 Evas_Canvas3D_Mesh *m; 85 Evas_Canvas3D_Mesh *m;
86 Evas_Canvas3D_Node *billboard = NULL; 86 Evas_Canvas3D_Node *billboard = NULL;
87 eo_do((Evas_Canvas3D_Node *)event_info, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); 87 eo_do((Evas_Canvas3D_Node *)event->event_info, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get());
88 EINA_LIST_FOREACH(meshes, l, m) 88 EINA_LIST_FOREACH(meshes, l, m)
89 { 89 {
90 eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE)); 90 eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE));
91 } 91 }
92 if (choosed_node != (Evas_Canvas3D_Node *)event_info) 92 if (choosed_node != (Evas_Canvas3D_Node *)event->event_info)
93 { 93 {
94 eo_do(choosed_node, billboard = evas_canvas3d_node_billboard_target_get()); 94 eo_do(choosed_node, billboard = evas_canvas3d_node_billboard_target_get());
95 if (!billboard) 95 if (!billboard)
@@ -100,18 +100,18 @@ _cb_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Descript
100 eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG)); 100 eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
101 } 101 }
102 } 102 }
103 choosed_node = (Evas_Canvas3D_Node *)event_info; 103 choosed_node = (Evas_Canvas3D_Node *)event->event_info;
104 } 104 }
105 105
106 return EINA_TRUE; 106 return EINA_TRUE;
107} 107}
108 108
109Eina_Bool 109Eina_Bool
110_cb_collision(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 110_cb_collision(void *data EINA_UNUSED, const Eo_Event *event)
111{ 111{
112 Eina_List *meshes = NULL, *l; 112 Eina_List *meshes = NULL, *l;
113 Evas_Canvas3D_Mesh *m; 113 Evas_Canvas3D_Mesh *m;
114 eo_do((Evas_Canvas3D_Node *)event_info, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get()); 114 eo_do((Evas_Canvas3D_Node *)event->event_info, meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get());
115 EINA_LIST_FOREACH(meshes, l, m) 115 EINA_LIST_FOREACH(meshes, l, m)
116 { 116 {
117 eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE)); 117 eo_do(m, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE));
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 eab7464288..2c869fd1f4 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -90,16 +90,16 @@ static void _write_cb(pa_stream *stream, size_t len, void *data)
90 } 90 }
91} 91}
92 92
93static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, Eo *eo_obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 93static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, const Eo_Event *event)
94{ 94{
95 pa_stream *stream = NULL; 95 pa_stream *stream = NULL;
96 int samplerate = 0; 96 int samplerate = 0;
97 double speed = 0; 97 double speed = 0;
98 98
99 eo_do(eo_obj, samplerate = ecore_audio_obj_in_samplerate_get()); 99 eo_do(event->obj, samplerate = ecore_audio_obj_in_samplerate_get());
100 eo_do(eo_obj, speed = ecore_audio_obj_in_speed_get()); 100 eo_do(event->obj, speed = ecore_audio_obj_in_speed_get());
101 101
102 eo_do(eo_obj, stream = eo_key_data_get("pulse_data")); 102 eo_do(event->obj, stream = eo_key_data_get("pulse_data"));
103 103
104 pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL)); 104 pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL));
105 105
@@ -148,12 +148,12 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
148 return ret; 148 return ret;
149} 149}
150 150
151static Eina_Bool _delayed_attach_cb(void *data, Eo *eo_obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 151static Eina_Bool _delayed_attach_cb(void *data, const Eo_Event *event)
152{ 152{
153 Eo *in = data; 153 Eo *in = data;
154 eo_do(eo_obj, eo_event_callback_del(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in)); 154 eo_do(event->obj, eo_event_callback_del(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in));
155 155
156 _input_attach_internal(eo_obj, in); 156 _input_attach_internal(event->obj, in);
157 157
158 return EINA_TRUE; 158 return EINA_TRUE;
159} 159}
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index d40fdc5bd6..049d4f2a7e 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -162,9 +162,9 @@ ecore_con_url_pipeline_get(void)
162extern Ecore_Con_Socks *_ecore_con_proxy_global; 162extern Ecore_Con_Socks *_ecore_con_proxy_global;
163 163
164static Eina_Bool 164static Eina_Bool
165_efl_network_url_event_complete_cb(void *data EINA_UNUSED, Eo *child, const Eo_Event_Description *desc EINA_UNUSED, void *einfo) 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 = einfo; 167 Ecore_Con_Event_Url_Complete *e, *f = event->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) return EO_CALLBACK_STOP;
@@ -172,16 +172,16 @@ _efl_network_url_event_complete_cb(void *data EINA_UNUSED, Eo *child, const Eo_E
172 e->status = f->status; 172 e->status = f->status;
173 e->url_con = f->url_con; 173 e->url_con = f->url_con;
174 ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e, 174 ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e,
175 (Ecore_End_Cb)_ecore_con_event_url_free, child); 175 (Ecore_End_Cb)_ecore_con_event_url_free, event->obj);
176 176
177 return EO_CALLBACK_STOP; 177 return EO_CALLBACK_STOP;
178} 178}
179 179
180static Eina_Bool 180static Eina_Bool
181_efl_network_url_event_data_cb(void *data EINA_UNUSED, Eo *child, const Eo_Event_Description *desc EINA_UNUSED, void *einfo) 181_efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event)
182{ 182{
183 Ecore_Con_Event_Url_Data *e; 183 Ecore_Con_Event_Url_Data *e;
184 Efl_Network_Event_Url_Data *f = einfo; 184 Efl_Network_Event_Url_Data *f = event->event_info;
185 185
186 e = malloc(sizeof(Ecore_Con_Event_Url_Data) + sizeof(unsigned char) * f->size); 186 e = malloc(sizeof(Ecore_Con_Event_Url_Data) + sizeof(unsigned char) * f->size);
187 187
@@ -191,15 +191,15 @@ _efl_network_url_event_data_cb(void *data EINA_UNUSED, Eo *child, const Eo_Event
191 e->size = f->size; 191 e->size = f->size;
192 memcpy(e->data, f->data, f->size); 192 memcpy(e->data, f->data, f->size);
193 ecore_event_add(ECORE_CON_EVENT_URL_DATA, e, 193 ecore_event_add(ECORE_CON_EVENT_URL_DATA, e,
194 (Ecore_End_Cb)_ecore_con_event_url_free, child); 194 (Ecore_End_Cb)_ecore_con_event_url_free, event->obj);
195 195
196 return EO_CALLBACK_CONTINUE; 196 return EO_CALLBACK_CONTINUE;
197} 197}
198 198
199static Eina_Bool 199static Eina_Bool
200_efl_network_url_event_progress_cb(void *data EINA_UNUSED, Eo *child, const Eo_Event_Description *desc EINA_UNUSED, void *einfo) 200_efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event)
201{ 201{
202 Ecore_Con_Event_Url_Progress *e, *f = einfo; 202 Ecore_Con_Event_Url_Progress *e, *f = event->event_info;
203 203
204 e = malloc(sizeof(Ecore_Con_Event_Url_Progress)); 204 e = malloc(sizeof(Ecore_Con_Event_Url_Progress));
205 if (!e) return EO_CALLBACK_CONTINUE; 205 if (!e) return EO_CALLBACK_CONTINUE;
@@ -210,7 +210,7 @@ _efl_network_url_event_progress_cb(void *data EINA_UNUSED, Eo *child, const Eo_E
210 e->up.total = f->up.total; 210 e->up.total = f->up.total;
211 e->up.now = f->up.now; 211 e->up.now = f->up.now;
212 ecore_event_add(ECORE_CON_EVENT_URL_PROGRESS, e, 212 ecore_event_add(ECORE_CON_EVENT_URL_PROGRESS, e,
213 (Ecore_End_Cb)_ecore_con_event_url_free, child); 213 (Ecore_End_Cb)_ecore_con_event_url_free, event->obj);
214 214
215 return EO_CALLBACK_CONTINUE; 215 return EO_CALLBACK_CONTINUE;
216} 216}
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 8016d85eee..7b5a3a5851 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3139,12 +3139,9 @@ _ecore_evas_animator_fallback(void *data)
3139} 3139}
3140 3140
3141static Eina_Bool 3141static Eina_Bool
3142_check_animator_event_catcher_add(void *data, 3142_check_animator_event_catcher_add(void *data, const Eo_Event *event)
3143 Eo *obj EINA_UNUSED,
3144 const Eo_Event_Description2 *desc EINA_UNUSED,
3145 void *event_info)
3146{ 3143{
3147 const Eo_Callback_Array_Item *array = event_info; 3144 const Eo_Callback_Array_Item *array = event->event_info;
3148 Ecore_Evas *ee = data; 3145 Ecore_Evas *ee = data;
3149 int i; 3146 int i;
3150 3147
@@ -3178,12 +3175,9 @@ _check_animator_event_catcher_add(void *data,
3178} 3175}
3179 3176
3180static Eina_Bool 3177static Eina_Bool
3181_check_animator_event_catcher_del(void *data, 3178_check_animator_event_catcher_del(void *data, const Eo_Event *event)
3182 Eo *obj EINA_UNUSED,
3183 const Eo_Event_Description2 *desc EINA_UNUSED,
3184 void *event_info)
3185{ 3179{
3186 const Eo_Callback_Array_Item *array = event_info; 3180 const Eo_Callback_Array_Item *array = event->event_info;
3187 Ecore_Evas *ee = data; 3181 Ecore_Evas *ee = data;
3188 int i; 3182 int i;
3189 3183
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index d0d34cbda8..2292155425 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -76,7 +76,7 @@ struct _Ector_Renderer_Cairo_Shape_Data
76}; 76};
77 77
78static Eina_Bool 78static Eina_Bool
79_ector_renderer_cairo_shape_path_changed(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info 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
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c
index bf69e0b42b..b0927128cd 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -21,7 +21,7 @@ struct _Ector_Renderer_GL_Shape_Data
21}; 21};
22 22
23static Eina_Bool 23static Eina_Bool
24_ector_renderer_gl_shape_path_changed(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info 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
diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c
index a4ea6cae95..beaf043da8 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -681,9 +681,7 @@ _ector_renderer_software_shape_efl_gfx_shape_path_set(Eo *obj,
681 681
682 682
683static Eina_Bool 683static Eina_Bool
684_ector_renderer_software_shape_path_changed(void *data, Eo *obj EINA_UNUSED, 684_ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EINA_UNUSED)
685 const Eo_Event_Description *desc EINA_UNUSED,
686 void *event_info EINA_UNUSED)
687{ 685{
688 Ector_Renderer_Software_Shape_Data *pd = data; 686 Ector_Renderer_Software_Shape_Data *pd = data;
689 687
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 1d97f58267..8678933664 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -1,15 +1,15 @@
1#include "edje_private.h" 1#include "edje_private.h"
2 2
3static Eina_Bool 3static Eina_Bool
4_edje_hold_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 4_edje_hold_signal_cb(void *data, const Eo_Event *event)
5{ 5{
6 Evas_Event_Hold *ev; 6 Evas_Event_Hold *ev;
7 Edje *ed; 7 Edje *ed;
8 Edje_Real_Part *rp; 8 Edje_Real_Part *rp;
9 9
10 ev = event_info; 10 ev = event->event_info;
11 ed = data; 11 ed = data;
12 rp = evas_object_data_get(obj, "real_part"); 12 rp = evas_object_data_get(event->obj, "real_part");
13 if (!rp) return EO_CALLBACK_CONTINUE; 13 if (!rp) return EO_CALLBACK_CONTINUE;
14 if (ev->hold) 14 if (ev->hold)
15 _edje_emit(ed, "hold,on", rp->part->name); 15 _edje_emit(ed, "hold,on", rp->part->name);
@@ -20,13 +20,13 @@ _edje_hold_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_
20} 20}
21 21
22static Eina_Bool 22static Eina_Bool
23_edje_focus_in_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 23_edje_focus_in_signal_cb(void *data, const Eo_Event *event)
24{ 24{
25 Edje *ed; 25 Edje *ed;
26 Edje_Real_Part *rp; 26 Edje_Real_Part *rp;
27 27
28 ed = data; 28 ed = data;
29 rp = evas_object_data_get(obj, "real_part"); 29 rp = evas_object_data_get(event->obj, "real_part");
30 if ((!rp) || (!ed)) 30 if ((!rp) || (!ed))
31 return EO_CALLBACK_CONTINUE; 31 return EO_CALLBACK_CONTINUE;
32 32
@@ -36,13 +36,13 @@ _edje_focus_in_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc E
36} 36}
37 37
38static Eina_Bool 38static Eina_Bool
39_edje_focus_out_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 39_edje_focus_out_signal_cb(void *data, const Eo_Event *event)
40{ 40{
41 Edje *ed; 41 Edje *ed;
42 Edje_Real_Part *rp; 42 Edje_Real_Part *rp;
43 43
44 ed = data; 44 ed = data;
45 rp = evas_object_data_get(obj, "real_part"); 45 rp = evas_object_data_get(event->obj, "real_part");
46 if ((!rp) || (!ed)) 46 if ((!rp) || (!ed))
47 return EO_CALLBACK_CONTINUE; 47 return EO_CALLBACK_CONTINUE;
48 48
@@ -52,15 +52,15 @@ _edje_focus_out_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
52} 52}
53 53
54static Eina_Bool 54static Eina_Bool
55_edje_mouse_in_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 55_edje_mouse_in_signal_cb(void *data, const Eo_Event *event)
56{ 56{
57 Evas_Event_Mouse_In *ev; 57 Evas_Event_Mouse_In *ev;
58 Edje *ed; 58 Edje *ed;
59 Edje_Real_Part *rp; 59 Edje_Real_Part *rp;
60 60
61 ev = event_info; 61 ev = event->event_info;
62 ed = data; 62 ed = data;
63 rp = evas_object_data_get(obj, "real_part"); 63 rp = evas_object_data_get(event->obj, "real_part");
64 if (rp) 64 if (rp)
65 { 65 {
66 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags)) 66 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags))
@@ -73,15 +73,15 @@ _edje_mouse_in_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc E
73} 73}
74 74
75static Eina_Bool 75static Eina_Bool
76_edje_mouse_out_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 76_edje_mouse_out_signal_cb(void *data, const Eo_Event *event)
77{ 77{
78 Evas_Event_Mouse_Out *ev; 78 Evas_Event_Mouse_Out *ev;
79 Edje *ed; 79 Edje *ed;
80 Edje_Real_Part *rp; 80 Edje_Real_Part *rp;
81 81
82 ev = event_info; 82 ev = event->event_info;
83 ed = data; 83 ed = data;
84 rp = evas_object_data_get(obj, "real_part"); 84 rp = evas_object_data_get(event->obj, "real_part");
85 if (rp) 85 if (rp)
86 { 86 {
87 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags)) 87 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags))
@@ -94,7 +94,7 @@ _edje_mouse_out_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
94} 94}
95 95
96static Eina_Bool 96static Eina_Bool
97_edje_mouse_down_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 97_edje_mouse_down_signal_cb(void *data, const Eo_Event *event)
98{ 98{
99 Evas_Event_Mouse_Down *ev; 99 Evas_Event_Mouse_Down *ev;
100 Edje *ed; 100 Edje *ed;
@@ -102,9 +102,9 @@ _edje_mouse_down_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
102 char buf[256]; 102 char buf[256];
103 int ignored; 103 int ignored;
104 104
105 ev = event_info; 105 ev = event->event_info;
106 ed = data; 106 ed = data;
107 rp = evas_object_data_get(obj, "real_part"); 107 rp = evas_object_data_get(event->obj, "real_part");
108 if (!rp) return EO_CALLBACK_CONTINUE; 108 if (!rp) return EO_CALLBACK_CONTINUE;
109 109
110 ignored = rp->part->ignore_flags & ev->event_flags; 110 ignored = rp->part->ignore_flags & ev->event_flags;
@@ -165,7 +165,7 @@ _edje_mouse_down_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
165} 165}
166 166
167static Eina_Bool 167static Eina_Bool
168_edje_mouse_up_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 168_edje_mouse_up_signal_cb(void *data, const Eo_Event *event)
169{ 169{
170 Evas_Event_Mouse_Up *ev; 170 Evas_Event_Mouse_Up *ev;
171 Edje *ed; 171 Edje *ed;
@@ -173,9 +173,9 @@ _edje_mouse_up_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc E
173 char buf[256]; 173 char buf[256];
174 int ignored; 174 int ignored;
175 175
176 ev = event_info; 176 ev = event->event_info;
177 ed = data; 177 ed = data;
178 rp = evas_object_data_get(obj, "real_part"); 178 rp = evas_object_data_get(event->obj, "real_part");
179 if (!rp) return EO_CALLBACK_CONTINUE; 179 if (!rp) return EO_CALLBACK_CONTINUE;
180 180
181 ignored = rp->part->ignore_flags & ev->event_flags; 181 ignored = rp->part->ignore_flags & ev->event_flags;
@@ -240,16 +240,16 @@ _edje_mouse_up_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc E
240} 240}
241 241
242static Eina_Bool 242static Eina_Bool
243_edje_mouse_move_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 243_edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
244{ 244{
245 Evas_Event_Mouse_Move *ev; 245 Evas_Event_Mouse_Move *ev;
246 Edje *ed; 246 Edje *ed;
247 Edje_Real_Part *rp; 247 Edje_Real_Part *rp;
248 int ignored; 248 int ignored;
249 249
250 ev = event_info; 250 ev = event->event_info;
251 ed = data; 251 ed = data;
252 rp = evas_object_data_get(obj, "real_part"); 252 rp = evas_object_data_get(event->obj, "real_part");
253 if (!rp) return EO_CALLBACK_CONTINUE; 253 if (!rp) return EO_CALLBACK_CONTINUE;
254 if (rp->part->dragable.event_id >= 0) 254 if (rp->part->dragable.event_id >= 0)
255 { 255 {
@@ -270,7 +270,7 @@ _edje_mouse_move_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
270 { 270 {
271 Evas_Coord x, y, w, h; 271 Evas_Coord x, y, w, h;
272 272
273 evas_object_geometry_get(obj, &x, &y, &w, &h); 273 evas_object_geometry_get(event->obj, &x, &y, &w, &h);
274 if ((ev->cur.canvas.x < x) || (ev->cur.canvas.y < y) || 274 if ((ev->cur.canvas.x < x) || (ev->cur.canvas.y < y) ||
275 (ev->cur.canvas.x >= (x + w)) || (ev->cur.canvas.y >= (y + h))) 275 (ev->cur.canvas.x >= (x + w)) || (ev->cur.canvas.y >= (y + h)))
276 { 276 {
@@ -287,7 +287,7 @@ _edje_mouse_move_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
287 { 287 {
288 Evas_Coord x, y, w, h; 288 Evas_Coord x, y, w, h;
289 289
290 evas_object_geometry_get(obj, &x, &y, &w, &h); 290 evas_object_geometry_get(event->obj, &x, &y, &w, &h);
291 if ((ev->cur.canvas.x >= x) && (ev->cur.canvas.y >= y) && 291 if ((ev->cur.canvas.x >= x) && (ev->cur.canvas.y >= y) &&
292 (ev->cur.canvas.x < (x + w)) && (ev->cur.canvas.y < (y + h))) 292 (ev->cur.canvas.x < (x + w)) && (ev->cur.canvas.y < (y + h)))
293 { 293 {
@@ -349,16 +349,16 @@ _edje_mouse_move_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
349} 349}
350 350
351static Eina_Bool 351static Eina_Bool
352_edje_mouse_wheel_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 352_edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event)
353{ 353{
354 Evas_Event_Mouse_Wheel *ev; 354 Evas_Event_Mouse_Wheel *ev;
355 Edje *ed; 355 Edje *ed;
356 Edje_Real_Part *rp; 356 Edje_Real_Part *rp;
357 char buf[256]; 357 char buf[256];
358 358
359 ev = event_info; 359 ev = event->event_info;
360 ed = data; 360 ed = data;
361 rp = evas_object_data_get(obj, "real_part"); 361 rp = evas_object_data_get(event->obj, "real_part");
362 if (rp) 362 if (rp)
363 { 363 {
364 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags)) 364 if (!(ev->event_flags) || !(rp->part->ignore_flags & ev->event_flags))
@@ -374,10 +374,7 @@ _edje_mouse_wheel_signal_cb(void *data, Eo *obj, const Eo_Event_Description *des
374} 374}
375 375
376Eina_Bool 376Eina_Bool
377_edje_timer_cb(void *data, 377_edje_timer_cb(void *data, const Eo_Event *event EINA_UNUSED)
378 Eo *obj EINA_UNUSED,
379 const Eo_Event_Description *desc EINA_UNUSED,
380 void *event_info EINA_UNUSED) // FIXME: figure out how to use event_info
381{ 378{
382 double t; 379 double t;
383 Eina_List *l; 380 Eina_List *l;
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index 92e36d50a0..273f6aa891 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -8,18 +8,18 @@ static int outs = 0;
8static Eina_Bool outfail = EINA_FALSE; 8static Eina_Bool outfail = EINA_FALSE;
9 9
10static Eina_Bool 10static Eina_Bool
11_play_finished(void *data EINA_UNUSED, Eo *in, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 11_play_finished(void *data EINA_UNUSED, const Eo_Event *event)
12{ 12{
13 eo_del(in); 13 eo_del(event->obj);
14 14
15 return EINA_TRUE; 15 return EINA_TRUE;
16} 16}
17 17
18static Eina_Bool 18static Eina_Bool
19_out_fail(void *data EINA_UNUSED, Eo *output EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 19_out_fail(void *data EINA_UNUSED, const Eo_Event *event)
20{ 20{
21 outfail = EINA_TRUE; 21 outfail = EINA_TRUE;
22 eo_del(out); 22 eo_del(event->obj);
23 out = NULL; 23 out = NULL;
24 return EINA_TRUE; 24 return EINA_TRUE;
25} 25}
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index b9c5843b2e..c2b4204371 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2297,7 +2297,7 @@ void _edje_recalc_do(Edje *ed);
2297int _edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y); 2297int _edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y);
2298void _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y); 2298void _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y);
2299 2299
2300Eina_Bool _edje_timer_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info); 2300Eina_Bool _edje_timer_cb(void *data, const Eo_Event *event);
2301Eina_Bool _edje_pending_timer_cb(void *data); 2301Eina_Bool _edje_pending_timer_cb(void *data);
2302void _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp); 2302void _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp);
2303void _edje_callbacks_focus_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp); 2303void _edje_callbacks_focus_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp);
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 2adaf7da8b..8f601bfa66 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -10,7 +10,8 @@ static double _edje_transition_duration_scale = 0;
10static Eina_Bool 10static Eina_Bool
11_edje_animator_cb(void *data) 11_edje_animator_cb(void *data)
12{ 12{
13 _edje_timer_cb(data, NULL, NULL, NULL); 13 const Eo_Event event = {0};
14 _edje_timer_cb(data, &event);
14 return EINA_TRUE; 15 return EINA_TRUE;
15} 16}
16 17
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 948a0b0d41..acf588341e 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -733,12 +733,12 @@ end:
733} 733}
734 734
735static Eina_Bool 735static Eina_Bool
736_eo_event_forwarder_callback(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc, void *event_info) 736_eo_event_forwarder_callback(void *data, const Eo_Event *event)
737{ 737{
738 Eo *new_obj = (Eo *) data; 738 Eo *new_obj = (Eo *) data;
739 Eina_Bool ret = EINA_FALSE; 739 Eina_Bool ret = EINA_FALSE;
740 740
741 eo_do(new_obj, ret = eo_event_callback_call(desc, (void *)event_info); ); 741 eo_do(new_obj, ret = eo_event_callback_call(event->desc, event->event_info); );
742 742
743 return ret; 743 return ret;
744} 744}
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 321101f69b..d4d578932c 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -59,10 +59,10 @@ typedef struct
59} _eo_evas_object_cb_info; 59} _eo_evas_object_cb_info;
60 60
61static Eina_Bool 61static Eina_Bool
62_eo_evas_object_cb(void *data, Eo *eo_obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 62_eo_evas_object_cb(void *data, const Eo_Event *event)
63{ 63{
64 _eo_evas_object_cb_info *info = data; 64 _eo_evas_object_cb_info *info = data;
65 if (info->func) info->func(info->data, evas_object_evas_get(eo_obj), eo_obj, event_info); 65 if (info->func) info->func(info->data, evas_object_evas_get(event->obj), event->obj, event->event_info);
66 return EINA_TRUE; 66 return EINA_TRUE;
67} 67}
68 68
@@ -75,10 +75,10 @@ typedef struct
75} _eo_evas_cb_info; 75} _eo_evas_cb_info;
76 76
77static Eina_Bool 77static Eina_Bool
78_eo_evas_cb(void *data, Eo *eo_obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 78_eo_evas_cb(void *data, const Eo_Event *event)
79{ 79{
80 _eo_evas_cb_info *info = data; 80 _eo_evas_cb_info *info = data;
81 if (info->func) info->func(info->data, eo_obj, event_info); 81 if (info->func) info->func(info->data, event->obj, event->event_info);
82 return EINA_TRUE; 82 return EINA_TRUE;
83} 83}
84 84
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index bf295cb088..965e0906ac 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -51,9 +51,7 @@ _generate_unic_color_key(Evas_Color *color, Evas_Color *bg_color, Evas_Canvas3D_
51} 51}
52 52
53static Eina_Bool 53static Eina_Bool
54_evas_canvas3d_node_private_callback_collision(void *data, Eo *obj EINA_UNUSED, 54_evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event)
55 const Eo_Event_Description *desc EINA_UNUSED,
56 void *event_info)
57{ 55{
58 Eina_List *collision_list = NULL, *l = NULL; 56 Eina_List *collision_list = NULL, *l = NULL;
59 Evas_Canvas3D_Node *target_node = NULL, *n = NULL; 57 Evas_Canvas3D_Node *target_node = NULL, *n = NULL;
@@ -61,7 +59,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, Eo *obj EINA_UNUSED,
61 const Eo_Event_Description *eo_desc = NULL; 59 const Eo_Event_Description *eo_desc = NULL;
62 Eina_Bool ret = EINA_FALSE; 60 Eina_Bool ret = EINA_FALSE;
63 61
64 target_node = (Evas_Canvas3D_Node *)event_info; 62 target_node = (Evas_Canvas3D_Node *)event->event_info;
65 pd_target = eo_data_scope_get(target_node, EVAS_CANVAS3D_NODE_CLASS); 63 pd_target = eo_data_scope_get(target_node, EVAS_CANVAS3D_NODE_CLASS);
66 collision_list = (Eina_List *)data; 64 collision_list = (Eina_List *)data;
67 eo_desc = eo_base_legacy_only_event_description_get("collision"); 65 eo_desc = eo_base_legacy_only_event_description_get("collision");
@@ -79,13 +77,11 @@ _evas_canvas3d_node_private_callback_collision(void *data, Eo *obj EINA_UNUSED,
79 return ret; 77 return ret;
80} 78}
81static Eina_Bool 79static Eina_Bool
82_evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, 80_evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Eo_Event *event)
83 const Eo_Event_Description *desc EINA_UNUSED,
84 void *event_info)
85{ 81{
86 Eina_Bool ret = EINA_FALSE; 82 Eina_Bool ret = EINA_FALSE;
87 const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get("clicked"); 83 const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get("clicked");
88 eo_do((Eo *)event_info, ret = eo_event_callback_call(eo_desc, event_info)); 84 eo_do((Eo *)event->event_info, ret = eo_event_callback_call(eo_desc, event->event_info));
89 85
90 return ret; 86 return ret;
91} 87}
diff --git a/src/lib/evas/canvas/evas_canvas3d_node_callback.h b/src/lib/evas/canvas/evas_canvas3d_node_callback.h
index 90a1f56226..0f02ae4a66 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node_callback.h
+++ b/src/lib/evas/canvas/evas_canvas3d_node_callback.h
@@ -24,11 +24,9 @@ const Eo_Event_Description evas_canvas3d_node_private_event_desc[] =
24 24
25/*Private callbacks */ 25/*Private callbacks */
26static Eina_Bool 26static Eina_Bool
27_evas_canvas3d_node_private_callback_clicked(void *data, Eo *obj, const Eo_Event_Description *desc, 27_evas_canvas3d_node_private_callback_clicked(void *data, const Eo_Event *event);
28 void *event_info);
29static Eina_Bool 28static Eina_Bool
30_evas_canvas3d_node_private_callback_collision(void *data, Eo *obj, const Eo_Event_Description *desc, 29_evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event);
31 void *event_info);
32 30
33Eo_Event_Cb evas_canvas3d_node_private_callback_functions[] = 31Eo_Event_Cb evas_canvas3d_node_private_callback_functions[] =
34{ 32{
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 11b370da3d..48bfd5c490 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -213,7 +213,7 @@ _evas_object_clip_mask_unset(Evas_Object_Protected_Data *obj)
213extern const char *o_rect_type; 213extern const char *o_rect_type;
214extern const char *o_image_type; 214extern const char *o_image_type;
215 215
216static Eina_Bool _clipper_del_cb(void *data, Eo *eo_clip, const Eo_Event_Description *desc EINA_UNUSED, void *info EINA_UNUSED); 216static Eina_Bool _clipper_del_cb(void *data, const Eo_Event *event);
217 217
218EOLIAN void 218EOLIAN void
219_evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip) 219_evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip)
@@ -478,7 +478,7 @@ _evas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj)
478} 478}
479 479
480static Eina_Bool 480static Eina_Bool
481_clipper_del_cb(void *data, Eo *eo_clip, const Eo_Event_Description *desc EINA_UNUSED, void *info EINA_UNUSED) 481_clipper_del_cb(void *data, const Eo_Event *event)
482{ 482{
483 Evas_Object *eo_obj = data; 483 Evas_Object *eo_obj = data;
484 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 484 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
@@ -486,7 +486,7 @@ _clipper_del_cb(void *data, Eo *eo_clip, const Eo_Event_Description *desc EINA_U
486 if (!obj) return EO_CALLBACK_CONTINUE; 486 if (!obj) return EO_CALLBACK_CONTINUE;
487 487
488 _evas_object_clip_unset(eo_obj, obj); 488 _evas_object_clip_unset(eo_obj, obj);
489 if (obj->prev->clipper && (obj->prev->clipper->object == eo_clip)) 489 if (obj->prev->clipper && (obj->prev->clipper->object == event->obj))
490 { 490 {
491 // not removing cb since it's the del cb... it can't be called again! 491 // not removing cb since it's the del cb... it can't be called again!
492 EINA_COW_STATE_WRITE_BEGIN(obj, state_write, prev) 492 EINA_COW_STATE_WRITE_BEGIN(obj, state_write, prev)
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index 428696ad5c..643f5ad9ed 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -69,9 +69,7 @@ _filter_end_sync(Evas_Filter_Context *ctx, Evas_Object_Protected_Data *obj,
69} 69}
70 70
71static Eina_Bool 71static Eina_Bool
72_render_post_cb(void *data, Eo *evas EINA_UNUSED, 72_render_post_cb(void *data, const Eo_Event *event EINA_UNUSED)
73 const Eo_Event_Description2 *desc EINA_UNUSED,
74 void *event_info EINA_UNUSED)
75{ 73{
76 Eo *eo_obj = data; 74 Eo *eo_obj = data;
77 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); 75 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 74f9a6c9af..3b664c1478 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -110,7 +110,7 @@ _evas_object_box_accessor_free(Evas_Object_Box_Accessor *it)
110} 110}
111 111
112static Eina_Bool 112static Eina_Bool
113_on_child_resize(void *data, Eo *o EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *einfo EINA_UNUSED) 113_on_child_resize(void *data, const Eo_Event *event EINA_UNUSED)
114{ 114{
115 Evas_Object *box = data; 115 Evas_Object *box = data;
116 EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(box, priv, EO_CALLBACK_CONTINUE); 116 EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(box, priv, EO_CALLBACK_CONTINUE);
@@ -120,12 +120,12 @@ _on_child_resize(void *data, Eo *o EINA_UNUSED, const Eo_Event_Description *desc
120} 120}
121 121
122static Eina_Bool 122static Eina_Bool
123_on_child_del(void *data, Eo *o, const Eo_Event_Description *desc EINA_UNUSED, void *einfo EINA_UNUSED) 123_on_child_del(void *data, const Eo_Event *event)
124{ 124{
125 Evas_Object *box = data; 125 Evas_Object *box = data;
126 126
127 Evas_Object *ret = NULL; 127 Evas_Object *ret = NULL;
128 eo_do(box, ret = evas_obj_box_internal_remove(o)); 128 eo_do(box, ret = evas_obj_box_internal_remove(event->obj));
129 if (!ret) 129 if (!ret)
130 ERR("child removal failed"); 130 ERR("child removal failed");
131 evas_object_smart_changed(box); 131 evas_object_smart_changed(box);
@@ -134,7 +134,7 @@ _on_child_del(void *data, Eo *o, const Eo_Event_Description *desc EINA_UNUSED, v
134} 134}
135 135
136static Eina_Bool 136static Eina_Bool
137_on_child_hints_changed(void *data, Eo *o EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *einfo EINA_UNUSED) 137_on_child_hints_changed(void *data, const Eo_Event *event EINA_UNUSED)
138{ 138{
139 Evas_Object *box = data; 139 Evas_Object *box = data;
140 EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(box, priv, EO_CALLBACK_CONTINUE); 140 EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(box, priv, EO_CALLBACK_CONTINUE);
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index daf236c667..154d93b210 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -83,27 +83,21 @@ _init_cow(void)
83} 83}
84 84
85static Eina_Bool 85static Eina_Bool
86_animator_repeater(void *data, 86_animator_repeater(void *data, const Eo_Event *event)
87 Eo *eo_obj EINA_UNUSED,
88 const Eo_Event_Description2 *desc EINA_UNUSED,
89 void *event_info)
90{ 87{
91 Evas_Object_Protected_Data *obj = data; 88 Evas_Object_Protected_Data *obj = data;
92 89
93 eo_do(obj->object, 90 eo_do(obj->object,
94 eo_event_callback_call(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, event_info)); 91 eo_event_callback_call(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, event->event_info));
95 DBG("Emitting animator tick on %p.", obj->object); 92 DBG("Emitting animator tick on %p.", obj->object);
96 93
97 return EO_CALLBACK_CONTINUE; 94 return EO_CALLBACK_CONTINUE;
98} 95}
99 96
100static Eina_Bool 97static Eina_Bool
101_check_event_catcher_add(void *data, 98_check_event_catcher_add(void *data, const Eo_Event *event)
102 Eo *eo_obj EINA_UNUSED,
103 const Eo_Event_Description2 *desc EINA_UNUSED,
104 void *event_info)
105{ 99{
106 const Eo_Callback_Array_Item *array = event_info; 100 const Eo_Callback_Array_Item *array = event->event_info;
107 Evas_Object_Protected_Data *obj = data; 101 Evas_Object_Protected_Data *obj = data;
108 int i; 102 int i;
109 103
@@ -128,12 +122,9 @@ _check_event_catcher_add(void *data,
128} 122}
129 123
130static Eina_Bool 124static Eina_Bool
131_check_event_catcher_del(void *data, 125_check_event_catcher_del(void *data, const Eo_Event *event)
132 Eo *eo_obj EINA_UNUSED,
133 const Eo_Event_Description2 *desc EINA_UNUSED,
134 void *event_info)
135{ 126{
136 const Eo_Callback_Array_Item *array = event_info; 127 const Eo_Callback_Array_Item *array = event->event_info;
137 Evas_Object_Protected_Data *obj = data; 128 Evas_Object_Protected_Data *obj = data;
138 int i; 129 int i;
139 130
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 8f9874f065..b3da505f12 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -61,10 +61,10 @@ struct _Evas_Object_Smart_Iterator
61}; 61};
62 62
63static Eina_Bool 63static Eina_Bool
64_eo_evas_smart_cb(void *data, Eo *eo_obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 64_eo_evas_smart_cb(void *data, const Eo_Event *event)
65{ 65{
66 _eo_evas_smart_cb_info *info = data; 66 _eo_evas_smart_cb_info *info = data;
67 if (info->func) info->func(info->data, eo_obj, event_info); 67 if (info->func) info->func(info->data, event->obj, event->event_info);
68 return EINA_TRUE; 68 return EINA_TRUE;
69} 69}
70 70
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 0c8ea11d0a..158237a812 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -244,16 +244,16 @@ _evas_object_table_option_del(Evas_Object *o)
244} 244}
245 245
246static Eina_Bool 246static Eina_Bool
247_on_child_del(void *data, Eo *child, const Eo_Event_Description *desc EINA_UNUSED, void *einfo EINA_UNUSED) 247_on_child_del(void *data, const Eo_Event *event)
248{ 248{
249 Evas_Object *table = data; 249 Evas_Object *table = data;
250 evas_object_table_unpack(table, child); 250 evas_object_table_unpack(table, event->obj);
251 251
252 return EO_CALLBACK_CONTINUE; 252 return EO_CALLBACK_CONTINUE;
253} 253}
254 254
255static Eina_Bool 255static Eina_Bool
256_on_child_hints_changed(void *data, Eo *child EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *einfo EINA_UNUSED) 256_on_child_hints_changed(void *data, const Eo_Event *event EINA_UNUSED)
257{ 257{
258 Evas_Object *table = data; 258 Evas_Object *table = data;
259 EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(table, priv, EO_CALLBACK_CONTINUE); 259 EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(table, priv, EO_CALLBACK_CONTINUE);
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 006bdac985..5a46004f51 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -7388,9 +7388,7 @@ _obstacle_find(Evas_Textblock_Data *obj, Eo *eo_obs)
7388} 7388}
7389 7389
7390Eina_Bool 7390Eina_Bool
7391_obstacle_del_cb(void *data, Eo *eo_obs, 7391_obstacle_del_cb(void *data, const Eo_Event *event)
7392 const Eo_Event_Description *desc EINA_UNUSED,
7393 void *event_info EINA_UNUSED)
7394{ 7392{
7395 Eo *eo_obj = data; 7393 Eo *eo_obj = data;
7396 Evas_Textblock_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 7394 Evas_Textblock_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
@@ -7399,7 +7397,7 @@ _obstacle_del_cb(void *data, Eo *eo_obs,
7399 7397
7400 EINA_LIST_FOREACH(obj->obstacles, i, obs) 7398 EINA_LIST_FOREACH(obj->obstacles, i, obs)
7401 { 7399 {
7402 if (eo_obs == obs->eo_obs) 7400 if (event->obj == obs->eo_obs)
7403 break; 7401 break;
7404 } 7402 }
7405 obj->obstacles = eina_list_remove_list(obj->obstacles, i); 7403 obj->obstacles = eina_list_remove_list(obj->obstacles, i);
diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c
index a574aedba8..7d96eeb37d 100644
--- a/src/lib/evas/canvas/evas_object_vg.c
+++ b/src/lib/evas/canvas/evas_object_vg.c
@@ -95,10 +95,7 @@ _evas_vg_root_node_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd)
95} 95}
96 96
97static Eina_Bool 97static Eina_Bool
98_cleanup_reference(void *data, 98_cleanup_reference(void *data, const Eo_Event *event EINA_UNUSED)
99 Eo *obj EINA_UNUSED,
100 const Eo_Event_Description *desc EINA_UNUSED,
101 void *event_info EINA_UNUSED)
102{ 99{
103 Evas_VG_Data *pd = data; 100 Evas_VG_Data *pd = data;
104 Eo *renderer; 101 Eo *renderer;
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index d160b45ce8..e53d29516b 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -18,7 +18,7 @@ static const Efl_VG_Interpolation interpolation_identity = {
18}; 18};
19 19
20static Eina_Bool 20static Eina_Bool
21_efl_vg_base_property_changed(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info) 21_efl_vg_base_property_changed(void *data, const Eo_Event *event)
22{ 22{
23 Efl_VG_Base_Data *pd = data; 23 Efl_VG_Base_Data *pd = data;
24 Eo *parent; 24 Eo *parent;
@@ -26,8 +26,8 @@ _efl_vg_base_property_changed(void *data, Eo *obj, const Eo_Event_Description *d
26 if (pd->changed) return EINA_TRUE; 26 if (pd->changed) return EINA_TRUE;
27 pd->changed = EINA_TRUE; 27 pd->changed = EINA_TRUE;
28 28
29 eo_do(obj, parent = eo_parent_get()); 29 eo_do(event->obj, parent = eo_parent_get());
30 eo_do(parent, eo_event_callback_call(desc, event_info)); 30 eo_do(parent, eo_event_callback_call(event->desc, event->event_info));
31 return EINA_TRUE; 31 return EINA_TRUE;
32} 32}
33 33
diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c
index 6e50cdb430..f35d0d6e1e 100644
--- a/src/lib/evas/canvas/evas_vg_root_node.c
+++ b/src/lib/evas/canvas/evas_vg_root_node.c
@@ -33,12 +33,10 @@ _evas_vg_root_node_render_pre(Eo *obj EINA_UNUSED,
33} 33}
34 34
35static Eina_Bool 35static Eina_Bool
36_evas_vg_root_node_changed(void *data, Eo *obj, 36_evas_vg_root_node_changed(void *data, const Eo_Event *event)
37 const Eo_Event_Description *desc EINA_UNUSED,
38 void *event_info EINA_UNUSED)
39{ 37{
40 Efl_VG_Root_Node_Data *pd = data; 38 Efl_VG_Root_Node_Data *pd = data;
41 Efl_VG_Base_Data *bd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); 39 Efl_VG_Base_Data *bd = eo_data_scope_get(event->obj, EFL_VG_BASE_CLASS);
42 40
43 if (bd->changed) return EINA_TRUE; 41 if (bd->changed) return EINA_TRUE;
44 bd->changed = EINA_TRUE; 42 bd->changed = EINA_TRUE;
diff --git a/src/modules/ethumb/emotion/emotion.c b/src/modules/ethumb/emotion/emotion.c
index ee2cdfedc0..792b0dba6c 100644
--- a/src/modules/ethumb/emotion/emotion.c
+++ b/src/modules/ethumb/emotion/emotion.c
@@ -81,8 +81,7 @@ _resize_movie(struct _emotion_plugin *_plugin)
81} 81}
82 82
83static Eina_Bool 83static Eina_Bool
84_frame_decode_cb(void *data, 84_frame_decode_cb(void *data, const Eo_Event *event EINA_UNUSED)
85 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
86{ 85{
87 struct _emotion_plugin *_plugin = data; 86 struct _emotion_plugin *_plugin = data;
88 87
@@ -95,8 +94,7 @@ _frame_decode_cb(void *data,
95 } 94 }
96 95
97static Eina_Bool 96static Eina_Bool
98_frame_resized_cb(void *data, 97_frame_resized_cb(void *data, const Eo_Event *event EINA_UNUSED)
99 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
100{ 98{
101 _resize_movie(data); 99 _resize_movie(data);
102 100
@@ -104,8 +102,7 @@ _frame_resized_cb(void *data,
104} 102}
105 103
106static Eina_Bool 104static Eina_Bool
107_video_stopped_cb(void *data, 105_video_stopped_cb(void *data, const Eo_Event *event EINA_UNUSED)
108 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
109{ 106{
110 struct _emotion_plugin *_plugin = data; 107 struct _emotion_plugin *_plugin = data;
111 108
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index 9c3b1357ea..e566cb780b 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -300,12 +300,11 @@ evas_gl_preload_render_relax(evas_gl_make_current_cb make_current, void *engine_
300} 300}
301 301
302static Eina_Bool 302static Eina_Bool
303_evas_gl_preload_target_die(void *data, Eo *obj, 303_evas_gl_preload_target_die(void *data, const Eo_Event *event)
304 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
305{ 304{
306 Evas_GL_Texture *tex = data; 305 Evas_GL_Texture *tex = data;
307 306
308 evas_gl_preload_target_unregister(tex, obj); 307 evas_gl_preload_target_unregister(tex, event->obj);
309 308
310 return EO_CALLBACK_CONTINUE; 309 return EO_CALLBACK_CONTINUE;
311} 310}
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));