summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-04-12 15:23:55 +0100
committerTom Hacohen <tom@stosb.com>2016-04-12 15:23:55 +0100
commitf14305024e28d9d427b69a2fc2ebc9f842f25353 (patch)
tree26e4adc8a26ed7789cb6c3682ca04740a4c6d091 /src
parent736fb9d4980a7dee83ca0721d8b9b58c6c12a39d (diff)
Eo event: rename Eo_Event->event_info to Eo_Event->info.
The previous naming was redundant and too long.
Diffstat (limited to 'src')
-rw-r--r--src/bindings/eo_cxx/eo_event.hh4
-rw-r--r--src/bindings/js/eo_js/eo_js_event.hh4
-rw-r--r--src/examples/eldbus/dbusmodel.c4
-rw-r--r--src/examples/elementary/filemvc.c4
-rw-r--r--src/examples/evas/evas-3d-shadows.c8
-rw-r--r--src/lib/ecore_con/ecore_con_url.c6
-rw-r--r--src/lib/ecore_evas/ecore_evas.c4
-rw-r--r--src/lib/edje/edje_callbacks.c14
-rw-r--r--src/lib/elementary/elc_combobox.c2
-rw-r--r--src/lib/elementary/elc_fileselector.c18
-rw-r--r--src/lib/elementary/elc_fileselector_button.c2
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c8
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c12
-rw-r--r--src/lib/elementary/elm_box.c8
-rw-r--r--src/lib/elementary/elm_color_class.c2
-rw-r--r--src/lib/elementary/elm_entry.c4
-rw-r--r--src/lib/elementary/elm_glview.c2
-rw-r--r--src/lib/elementary/elm_helper.c2
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.c2
-rw-r--r--src/lib/elementary/elm_menu.c2
-rw-r--r--src/lib/elementary/elm_spinner.c2
-rw-r--r--src/lib/elementary/elm_store.c4
-rw-r--r--src/lib/elementary/elm_view_form.c2
-rw-r--r--src/lib/elementary/elm_view_list.c10
-rw-r--r--src/lib/elementary/elm_widget.c8
-rw-r--r--src/lib/eo/eo_base.eo2
-rw-r--r--src/lib/eo/eo_base_class.c4
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c4
-rw-r--r--src/lib/evas/canvas/evas_object_main.c6
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c2
-rw-r--r--src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c2
-rw-r--r--src/tests/eio/eio_model_test_file.c6
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c8
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c2
-rw-r--r--src/tests/elementary/elm_test_genlist.c2
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c2
-rw-r--r--src/tests/eo/signals/signals_main.c2
-rw-r--r--src/tests/eo/signals/signals_simple.c4
-rw-r--r--src/tests/eo/suite/eo_test_general.c2
-rw-r--r--src/tests/eolian_cxx/callback.c2
43 files changed, 98 insertions, 98 deletions
diff --git a/src/bindings/eo_cxx/eo_event.hh b/src/bindings/eo_cxx/eo_event.hh
index fbc3bf60cd..5633e89229 100644
--- a/src/bindings/eo_cxx/eo_event.hh
+++ b/src/bindings/eo_cxx/eo_event.hh
@@ -141,8 +141,8 @@ event_callback(void *data, ::Eo_Event const* event)
141{ 141{
142 T wrapper(::eo_ref(event->obj)); 142 T wrapper(::eo_ref(event->obj));
143 F *f = static_cast<F*>(data); 143 F *f = static_cast<F*>(data);
144 return _detail::really_call_event(wrapper, *f, *event->desc, event->event_info 144 return _detail::really_call_event(wrapper, *f, *event->desc, event->info
145 , std::is_void<decltype((*f)(wrapper, *event->desc, event->event_info))>()); 145 , std::is_void<decltype((*f)(wrapper, *event->desc, event->info))>());
146} 146}
147 147
148} 148}
diff --git a/src/bindings/js/eo_js/eo_js_event.hh b/src/bindings/js/eo_js/eo_js_event.hh
index b589e5d6cc..3e1ff638c6 100644
--- a/src/bindings/js/eo_js/eo_js_event.hh
+++ b/src/bindings/js/eo_js/eo_js_event.hh
@@ -60,11 +60,11 @@ inline Eina_Bool event_callback(void* data, Eo_Event const* eo_event)
60 v8::HandleScope handle_scope(isolate); 60 v8::HandleScope handle_scope(isolate);
61 event_callback_information* event = static_cast<event_callback_information*>(data); 61 event_callback_information* event = static_cast<event_callback_information*>(data);
62 v8::Handle<v8::Value> a[] = {eina::js::compatibility_new<v8::External>(isolate, eo_event->obj)}; 62 v8::Handle<v8::Value> a[] = {eina::js::compatibility_new<v8::External>(isolate, eo_event->obj)};
63 v8::Local<v8::Object> self = (event->event_info->constructor->handle())->NewInstance(1, a); 63 v8::Local<v8::Object> self = (event->info->constructor->handle())->NewInstance(1, a);
64 64
65 v8::Local<v8::Value> call_args[] = { 65 v8::Local<v8::Value> call_args[] = {
66 self, 66 self,
67 get_event_info<T>(eo_event->event_info, isolate, event->event_info->class_name) 67 get_event_info<T>(eo_event->info, isolate, event->info->class_name)
68 }; 68 };
69 event->function.handle()->Call(eina::js::compatibility_global(), 2, call_args); 69 event->function.handle()->Call(eina::js::compatibility_global(), 2, call_args);
70 70
diff --git a/src/examples/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c
index e9a3739992..f2c5e87860 100644
--- a/src/examples/eldbus/dbusmodel.c
+++ b/src/examples/eldbus/dbusmodel.c
@@ -16,7 +16,7 @@ static unsigned int children_count = 0;
16static Eina_Bool 16static Eina_Bool
17_event_interface_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event) 17_event_interface_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
18{ 18{
19 Efl_Model_Load *actual_load = (Efl_Model_Load*)event->event_info; 19 Efl_Model_Load *actual_load = (Efl_Model_Load*)event->info;
20 Eina_Array *properties_list; 20 Eina_Array *properties_list;
21 Eina_Array_Iterator iterator; 21 Eina_Array_Iterator iterator;
22 Eina_Value const* property_value; 22 Eina_Value const* property_value;
@@ -57,7 +57,7 @@ _event_interface_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
57static Eina_Bool 57static Eina_Bool
58_event_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event) 58_event_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
59{ 59{
60 Efl_Model_Load *actual_load = (Efl_Model_Load*)event->event_info; 60 Efl_Model_Load *actual_load = (Efl_Model_Load*)event->info;
61 Eina_Accessor *accessor; 61 Eina_Accessor *accessor;
62 Eo *child = NULL; 62 Eo *child = NULL;
63 unsigned int i; 63 unsigned int i;
diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c
index 2463e93bb3..3b4fe5a121 100644
--- a/src/examples/elementary/filemvc.c
+++ b/src/examples/elementary/filemvc.c
@@ -50,7 +50,7 @@ static Eina_Bool
50_list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event) 50_list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event)
51{ 51{
52 Efl_Model_Test_Filemvc_Data *priv = data; 52 Efl_Model_Test_Filemvc_Data *priv = data;
53 Eo *child = event->event_info; 53 Eo *child = event->info;
54 ethumb_client_file_free(elm_thumb_ethumb_client_get()); 54 ethumb_client_file_free(elm_thumb_ethumb_client_get());
55 55
56 printf("LIST selected model\n"); 56 printf("LIST selected model\n");
@@ -62,7 +62,7 @@ static Eina_Bool
62_tree_selected_cb(void *data, const Eo_Event *event) 62_tree_selected_cb(void *data, const Eo_Event *event)
63{ 63{
64 Efl_Model_Test_Filemvc_Data *priv = data; 64 Efl_Model_Test_Filemvc_Data *priv = data;
65 Eo *child = event->event_info; 65 Eo *child = event->info;
66 const Eina_Value *vpath; 66 const Eina_Value *vpath;
67 Eo *model; 67 Eo *model;
68 char *path; 68 char *path;
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 4497308b52..5d0034b098 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -84,12 +84,12 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
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 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->event_info); 87 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->info);
88 EINA_LIST_FOREACH(meshes, l, m) 88 EINA_LIST_FOREACH(meshes, l, m)
89 { 89 {
90 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 90 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
91 } 91 }
92 if (choosed_node != (Evas_Canvas3D_Node *)event->event_info) 92 if (choosed_node != (Evas_Canvas3D_Node *)event->info)
93 { 93 {
94 billboard = evas_canvas3d_node_billboard_target_get(choosed_node); 94 billboard = evas_canvas3d_node_billboard_target_get(choosed_node);
95 if (!billboard) 95 if (!billboard)
@@ -100,7 +100,7 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
100 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG); 100 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_PHONG);
101 } 101 }
102 } 102 }
103 choosed_node = (Evas_Canvas3D_Node *)event->event_info; 103 choosed_node = (Evas_Canvas3D_Node *)event->info;
104 } 104 }
105 105
106 return EINA_TRUE; 106 return EINA_TRUE;
@@ -111,7 +111,7 @@ _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 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->event_info); 114 meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get((Evas_Canvas3D_Node *)event->info);
115 EINA_LIST_FOREACH(meshes, l, m) 115 EINA_LIST_FOREACH(meshes, l, m)
116 { 116 {
117 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE); 117 evas_canvas3d_mesh_shade_mode_set(m, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 21f0193fea..507770fcf0 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -164,7 +164,7 @@ extern Ecore_Con_Socks *_ecore_con_proxy_global;
164static Eina_Bool 164static Eina_Bool
165_efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event) 165_efl_network_url_event_complete_cb(void *data EINA_UNUSED, const Eo_Event *event)
166{ 166{
167 Ecore_Con_Event_Url_Complete *e, *f = event->event_info; 167 Ecore_Con_Event_Url_Complete *e, *f = event->info;
168 168
169 e = calloc(1, sizeof(Ecore_Con_Event_Url_Complete)); 169 e = calloc(1, sizeof(Ecore_Con_Event_Url_Complete));
170 if (!e) return EO_CALLBACK_STOP; 170 if (!e) return EO_CALLBACK_STOP;
@@ -181,7 +181,7 @@ static Eina_Bool
181_efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event) 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 = event->event_info; 184 Efl_Network_Event_Url_Data *f = 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
@@ -199,7 +199,7 @@ _efl_network_url_event_data_cb(void *data EINA_UNUSED, const Eo_Event *event)
199static Eina_Bool 199static Eina_Bool
200_efl_network_url_event_progress_cb(void *data EINA_UNUSED, const Eo_Event *event) 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 = event->event_info; 202 Ecore_Con_Event_Url_Progress *e, *f = 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;
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index a4692ac1f3..2a54555a83 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3143,7 +3143,7 @@ _ecore_evas_animator_fallback(void *data)
3143static Eina_Bool 3143static Eina_Bool
3144_check_animator_event_catcher_add(void *data, const Eo_Event *event) 3144_check_animator_event_catcher_add(void *data, const Eo_Event *event)
3145{ 3145{
3146 const Eo_Callback_Array_Item *array = event->event_info; 3146 const Eo_Callback_Array_Item *array = event->info;
3147 Ecore_Evas *ee = data; 3147 Ecore_Evas *ee = data;
3148 int i; 3148 int i;
3149 3149
@@ -3179,7 +3179,7 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event)
3179static Eina_Bool 3179static Eina_Bool
3180_check_animator_event_catcher_del(void *data, const Eo_Event *event) 3180_check_animator_event_catcher_del(void *data, const Eo_Event *event)
3181{ 3181{
3182 const Eo_Callback_Array_Item *array = event->event_info; 3182 const Eo_Callback_Array_Item *array = event->info;
3183 Ecore_Evas *ee = data; 3183 Ecore_Evas *ee = data;
3184 int i; 3184 int i;
3185 3185
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index c0e08b5cd6..5533ffd558 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -7,7 +7,7 @@ _edje_hold_signal_cb(void *data, const Eo_Event *event)
7 Edje *ed; 7 Edje *ed;
8 Edje_Real_Part *rp; 8 Edje_Real_Part *rp;
9 9
10 ev = event->event_info; 10 ev = event->info;
11 ed = data; 11 ed = data;
12 rp = evas_object_data_get(event->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;
@@ -58,7 +58,7 @@ _edje_mouse_in_signal_cb(void *data, const Eo_Event *event)
58 Edje *ed; 58 Edje *ed;
59 Edje_Real_Part *rp; 59 Edje_Real_Part *rp;
60 60
61 ev = event->event_info; 61 ev = event->info;
62 ed = data; 62 ed = data;
63 rp = evas_object_data_get(event->obj, "real_part"); 63 rp = evas_object_data_get(event->obj, "real_part");
64 if (rp) 64 if (rp)
@@ -79,7 +79,7 @@ _edje_mouse_out_signal_cb(void *data, const Eo_Event *event)
79 Edje *ed; 79 Edje *ed;
80 Edje_Real_Part *rp; 80 Edje_Real_Part *rp;
81 81
82 ev = event->event_info; 82 ev = event->info;
83 ed = data; 83 ed = data;
84 rp = evas_object_data_get(event->obj, "real_part"); 84 rp = evas_object_data_get(event->obj, "real_part");
85 if (rp) 85 if (rp)
@@ -102,7 +102,7 @@ _edje_mouse_down_signal_cb(void *data, const Eo_Event *event)
102 char buf[256]; 102 char buf[256];
103 int ignored; 103 int ignored;
104 104
105 ev = event->event_info; 105 ev = event->info;
106 ed = data; 106 ed = data;
107 rp = evas_object_data_get(event->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;
@@ -173,7 +173,7 @@ _edje_mouse_up_signal_cb(void *data, const Eo_Event *event)
173 char buf[256]; 173 char buf[256];
174 int ignored; 174 int ignored;
175 175
176 ev = event->event_info; 176 ev = event->info;
177 ed = data; 177 ed = data;
178 rp = evas_object_data_get(event->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;
@@ -247,7 +247,7 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
247 Edje_Real_Part *rp; 247 Edje_Real_Part *rp;
248 int ignored; 248 int ignored;
249 249
250 ev = event->event_info; 250 ev = event->info;
251 ed = data; 251 ed = data;
252 rp = evas_object_data_get(event->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;
@@ -356,7 +356,7 @@ _edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event)
356 Edje_Real_Part *rp; 356 Edje_Real_Part *rp;
357 char buf[256]; 357 char buf[256];
358 358
359 ev = event->event_info; 359 ev = event->info;
360 ed = data; 360 ed = data;
361 rp = evas_object_data_get(event->obj, "real_part"); 361 rp = evas_object_data_get(event->obj, "real_part");
362 if (rp) 362 if (rp)
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 65e82051b8..792017ea60 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -228,7 +228,7 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event)
228 return EINA_TRUE; 228 return EINA_TRUE;
229 } 229 }
230 230
231 eo_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->event_info); 231 eo_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info);
232 232
233 if (sd->count > 0) 233 if (sd->count > 0)
234 { 234 {
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 7f230654d1..79f5e26ae9 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -701,7 +701,7 @@ _populate(Evas_Object *obj,
701static Eina_Bool 701static Eina_Bool
702_on_list_expanded(void *data, const Eo_Event *event) 702_on_list_expanded(void *data, const Eo_Event *event)
703{ 703{
704 Elm_Object_Item *it = event->event_info; 704 Elm_Object_Item *it = event->info;
705 const char *path = elm_object_item_data_get(it); 705 const char *path = elm_object_item_data_get(it);
706 706
707 _populate(data, path, it, NULL); 707 _populate(data, path, it, NULL);
@@ -712,7 +712,7 @@ _on_list_expanded(void *data, const Eo_Event *event)
712static Eina_Bool 712static Eina_Bool
713_on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event) 713_on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event)
714{ 714{
715 Elm_Object_Item *it = event->event_info; 715 Elm_Object_Item *it = event->info;
716 716
717 elm_genlist_item_subitems_clear(it); 717 elm_genlist_item_subitems_clear(it);
718 718
@@ -722,7 +722,7 @@ _on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event)
722static Eina_Bool 722static Eina_Bool
723_on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event) 723_on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event)
724{ 724{
725 Elm_Object_Item *it = event->event_info; 725 Elm_Object_Item *it = event->info;
726 726
727 elm_genlist_item_expanded_set(it, EINA_TRUE); 727 elm_genlist_item_expanded_set(it, EINA_TRUE);
728 728
@@ -732,7 +732,7 @@ _on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event)
732static Eina_Bool 732static Eina_Bool
733_on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event) 733_on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event)
734{ 734{
735 Elm_Object_Item *it = event->event_info; 735 Elm_Object_Item *it = event->info;
736 736
737 elm_genlist_item_expanded_set(it, EINA_FALSE); 737 elm_genlist_item_expanded_set(it, EINA_FALSE);
738 738
@@ -784,7 +784,7 @@ static Eina_Bool
784_on_item_activated(void *data, const Eo_Event *event) 784_on_item_activated(void *data, const Eo_Event *event)
785{ 785{
786 //This event_info could be a list or gengrid item 786 //This event_info could be a list or gengrid item
787 Elm_Object_Item *it = event->event_info; 787 Elm_Object_Item *it = event->info;
788 const char *path; 788 const char *path;
789 Eina_Bool is_dir; 789 Eina_Bool is_dir;
790 790
@@ -840,7 +840,7 @@ static Eina_Bool
840_on_item_selected(void *data, const Eo_Event *event) 840_on_item_selected(void *data, const Eo_Event *event)
841{ 841{
842 //This event_info could be a list or gengrid item 842 //This event_info could be a list or gengrid item
843 Elm_Object_Item *it = event->event_info; 843 Elm_Object_Item *it = event->info;
844 const char *path; 844 const char *path;
845 char *parent_path; 845 char *parent_path;
846 Eina_Bool is_dir; 846 Eina_Bool is_dir;
@@ -931,7 +931,7 @@ _on_item_unselected(void *data, const Eo_Event *event)
931 char *path; 931 char *path;
932 const char *unselected_path; 932 const char *unselected_path;
933 Eina_Strbuf *buf; 933 Eina_Strbuf *buf;
934 Elm_Object_Item *it = event->event_info; 934 Elm_Object_Item *it = event->info;
935 Eina_Bool first = EINA_TRUE; 935 Eina_Bool first = EINA_TRUE;
936 936
937 ELM_FILESELECTOR_DATA_GET(data, sd); 937 ELM_FILESELECTOR_DATA_GET(data, sd);
@@ -1175,7 +1175,7 @@ _on_text_unfocused(void *data, const Eo_Event *event EINA_UNUSED)
1175static Eina_Bool 1175static Eina_Bool
1176_anchor_clicked(void *data, const Eo_Event *event) 1176_anchor_clicked(void *data, const Eo_Event *event)
1177{ 1177{
1178 Elm_Entry_Anchor_Info *info = event->event_info; 1178 Elm_Entry_Anchor_Info *info = event->info;
1179 Evas_Object *fs = data; 1179 Evas_Object *fs = data;
1180 const char *p; 1180 const char *p;
1181 1181
@@ -1200,7 +1200,7 @@ _anchor_clicked(void *data, const Eo_Event *event)
1200static Eina_Bool 1200static Eina_Bool
1201_files_key_down(void *data, const Eo_Event *event) 1201_files_key_down(void *data, const Eo_Event *event)
1202{ 1202{
1203 Evas_Event_Key_Down *ev = event->event_info; 1203 Evas_Event_Key_Down *ev = event->info;
1204 Evas_Object *par, *searchbar; 1204 Evas_Object *par, *searchbar;
1205 1205
1206 par = data; 1206 par = data;
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 412aefdc69..75cee4d1d9 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -65,7 +65,7 @@ static Eina_Bool
65_selection_done(void *data, const Eo_Event *event) 65_selection_done(void *data, const Eo_Event *event)
66{ 66{
67 Elm_Fileselector_Button_Data *sd = data; 67 Elm_Fileselector_Button_Data *sd = data;
68 const char *file = event->event_info; 68 const char *file = event->info;
69 Evas_Object *del; 69 Evas_Object *del;
70 70
71 if (file) eina_stringshare_replace(&sd->fsd.path, file); 71 if (file) eina_stringshare_replace(&sd->fsd.path, file);
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 85bb72ea44..6296d35503 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -47,7 +47,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
47 static Eina_Bool \ 47 static Eina_Bool \
48 _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \ 48 _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \
49 { \ 49 { \
50 eo_event_callback_call(data, event, ev->event_info); \ 50 eo_event_callback_call(data, event, ev->info); \
51 \ 51 \
52 return EINA_TRUE; \ 52 return EINA_TRUE; \
53 } 53 }
@@ -67,7 +67,7 @@ SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED)
67static Eina_Bool 67static Eina_Bool
68_FILE_CHOSEN_fwd(void *data, const Eo_Event *event) 68_FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
69{ 69{
70 const char *file = event->event_info; 70 const char *file = event->info;
71 char *s; 71 char *s;
72 72
73 if (!file) return EINA_TRUE; 73 if (!file) return EINA_TRUE;
@@ -77,7 +77,7 @@ _FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
77 elm_object_text_set(sd->entry, s); 77 elm_object_text_set(sd->entry, s);
78 free(s); 78 free(s);
79 eo_event_callback_call 79 eo_event_callback_call
80 (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->event_info); 80 (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->info);
81 81
82 return EINA_TRUE; 82 return EINA_TRUE;
83} 83}
@@ -92,7 +92,7 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
92 file = elm_object_text_get(sd->entry); 92 file = elm_object_text_get(sd->entry);
93 elm_fileselector_path_set(sd->button, file); 93 elm_fileselector_path_set(sd->button, file);
94 eo_event_callback_call 94 eo_event_callback_call
95 (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->event_info); 95 (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->info);
96 96
97 return EINA_TRUE; 97 return EINA_TRUE;
98} 98}
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 3709b9c260..14f9a42a92 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -3801,7 +3801,7 @@ _handle_listener_change(void *data, const Eldbus_Message *msg EINA_UNUSED)
3801static Eina_Bool 3801static Eina_Bool
3802_state_changed_signal_send(void *data, const Eo_Event *event) 3802_state_changed_signal_send(void *data, const Eo_Event *event)
3803{ 3803{
3804 Elm_Atspi_Event_State_Changed_Data *state_data = event->event_info; 3804 Elm_Atspi_Event_State_Changed_Data *state_data = event->info;
3805 const char *type_desc; 3805 const char *type_desc;
3806 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3806 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE);
3807 3807
@@ -3822,7 +3822,7 @@ _state_changed_signal_send(void *data, const Eo_Event *event)
3822static Eina_Bool 3822static Eina_Bool
3823_property_changed_signal_send(void *data, const Eo_Event *event) 3823_property_changed_signal_send(void *data, const Eo_Event *event)
3824{ 3824{
3825 const char *property = event->event_info; 3825 const char *property = event->info;
3826 char *atspi_desc; 3826 char *atspi_desc;
3827 enum _Atspi_Object_Property prop = ATSPI_OBJECT_PROPERTY_LAST; 3827 enum _Atspi_Object_Property prop = ATSPI_OBJECT_PROPERTY_LAST;
3828 3828
@@ -3887,7 +3887,7 @@ _visible_data_changed_signal_send(void *data, const Eo_Event *event)
3887static Eina_Bool 3887static Eina_Bool
3888_active_descendant_changed_signal_send(void *data, const Eo_Event *event) 3888_active_descendant_changed_signal_send(void *data, const Eo_Event *event)
3889{ 3889{
3890 Eo *child = event->event_info; 3890 Eo *child = event->info;
3891 int idx; 3891 int idx;
3892 3892
3893 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3893 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE);
@@ -3907,7 +3907,7 @@ static Eina_Bool
3907_children_changed_signal_send(void *data, const Eo_Event *event) 3907_children_changed_signal_send(void *data, const Eo_Event *event)
3908{ 3908{
3909 const char *atspi_desc = NULL; 3909 const char *atspi_desc = NULL;
3910 Elm_Atspi_Event_Children_Changed_Data *ev_data = event->event_info; 3910 Elm_Atspi_Event_Children_Changed_Data *ev_data = event->info;
3911 int idx; 3911 int idx;
3912 enum _Atspi_Object_Child_Event_Type type; 3912 enum _Atspi_Object_Child_Event_Type type;
3913 3913
@@ -4094,7 +4094,7 @@ _text_caret_moved_send(void *data, const Eo_Event *event)
4094static Eina_Bool 4094static Eina_Bool
4095_text_text_inserted_send(void *data, const Eo_Event *event) 4095_text_text_inserted_send(void *data, const Eo_Event *event)
4096{ 4096{
4097 Elm_Atspi_Text_Change_Info *info = event->event_info; 4097 Elm_Atspi_Text_Change_Info *info = event->info;
4098 4098
4099 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4099 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
4100 4100
@@ -4110,7 +4110,7 @@ _text_text_inserted_send(void *data, const Eo_Event *event)
4110static Eina_Bool 4110static Eina_Bool
4111_text_text_removed_send(void *data, const Eo_Event *event) 4111_text_text_removed_send(void *data, const Eo_Event *event)
4112{ 4112{
4113 Elm_Atspi_Text_Change_Info *info = event->event_info; 4113 Elm_Atspi_Text_Change_Info *info = event->info;
4114 4114
4115 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4115 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
4116 4116
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 04231e1765..3bbf5c209a 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -32,7 +32,7 @@ static Eina_Bool
32_child_added_cb_proxy(void *data, const Eo_Event *event) 32_child_added_cb_proxy(void *data, const Eo_Event *event)
33{ 33{
34 Evas_Object *box = data; 34 Evas_Object *box = data;
35 Evas_Object_Box_Option *opt = event->event_info; 35 Evas_Object_Box_Option *opt = event->info;
36 eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj); 36 eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj);
37 37
38 return EINA_TRUE; 38 return EINA_TRUE;
@@ -42,7 +42,7 @@ static Eina_Bool
42_child_removed_cb_proxy(void *data, const Eo_Event *event) 42_child_removed_cb_proxy(void *data, const Eo_Event *event)
43{ 43{
44 Evas_Object *box = data; 44 Evas_Object *box = data;
45 Evas_Object *child = event->event_info; 45 Evas_Object *child = event->info;
46 eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child); 46 eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child);
47 47
48 return EINA_TRUE; 48 return EINA_TRUE;
@@ -196,7 +196,7 @@ static Eina_Bool
196_transition_layout_child_added(void *data, const Eo_Event *event) 196_transition_layout_child_added(void *data, const Eo_Event *event)
197{ 197{
198 Transition_Animation_Data *tad; 198 Transition_Animation_Data *tad;
199 Evas_Object_Box_Option *opt = event->event_info; 199 Evas_Object_Box_Option *opt = event->info;
200 Elm_Box_Transition *layout_data = data; 200 Elm_Box_Transition *layout_data = data;
201 201
202 tad = calloc(1, sizeof(Transition_Animation_Data)); 202 tad = calloc(1, sizeof(Transition_Animation_Data));
@@ -218,7 +218,7 @@ _transition_layout_child_removed(void *data, const Eo_Event *event)
218 218
219 EINA_LIST_FOREACH(layout_data->objs, l, tad) 219 EINA_LIST_FOREACH(layout_data->objs, l, tad)
220 { 220 {
221 if (tad->obj == event->event_info) 221 if (tad->obj == event->info)
222 { 222 {
223 free(eina_list_data_get(l)); 223 free(eina_list_data_get(l));
224 layout_data->objs = eina_list_remove_list(layout_data->objs, l); 224 layout_data->objs = eina_list_remove_list(layout_data->objs, l);
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index 856f59062b..41bd65ea0c 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -193,7 +193,7 @@ static Eina_Bool
193_colorclass_activate(void *data, const Eo_Event *event) 193_colorclass_activate(void *data, const Eo_Event *event)
194{ 194{
195 Colorclass_UI *cc = data; 195 Colorclass_UI *cc = data;
196 Elm_Object_Item *it = event->event_info; 196 Elm_Object_Item *it = event->info;
197 Edje_Color_Class *ecc; 197 Edje_Color_Class *ecc;
198 Colorclass *lcc; 198 Colorclass *lcc;
199 Eina_List *l; 199 Eina_List *l;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 42279fa09d..a081fc45cc 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3870,7 +3870,7 @@ elm_entry_add(Evas_Object *parent)
3870static Eina_Bool 3870static Eina_Bool
3871_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) 3871_cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
3872{ 3872{
3873 const Eo_Callback_Array_Item *event = ev->event_info; 3873 const Eo_Callback_Array_Item *event = ev->info;
3874 3874
3875 ELM_ENTRY_DATA_GET(ev->obj, sd); 3875 ELM_ENTRY_DATA_GET(ev->obj, sd);
3876 if (event->desc == ELM_ENTRY_EVENT_VALIDATE) 3876 if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
@@ -3881,7 +3881,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
3881static Eina_Bool 3881static Eina_Bool
3882_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) 3882_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
3883{ 3883{
3884 const Eo_Callback_Array_Item *event = ev->event_info; 3884 const Eo_Callback_Array_Item *event = ev->info;
3885 3885
3886 ELM_ENTRY_DATA_GET(ev->obj, sd); 3886 ELM_ENTRY_DATA_GET(ev->obj, sd);
3887 if (event->desc == ELM_ENTRY_EVENT_VALIDATE) 3887 if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index 80eeea7dad..9b1b3b038b 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -303,7 +303,7 @@ _elm_glview_evas_object_smart_del(Eo *obj, Elm_Glview_Data *sd)
303static Eina_Bool 303static Eina_Bool
304_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) 304_cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
305{ 305{
306 const Eo_Callback_Array_Item *event = ev->event_info; 306 const Eo_Callback_Array_Item *event = ev->info;
307 307
308 ELM_GLVIEW_DATA_GET(ev->obj, sd); 308 ELM_GLVIEW_DATA_GET(ev->obj, sd);
309 309
diff --git a/src/lib/elementary/elm_helper.c b/src/lib/elementary/elm_helper.c
index 4f5710af4a..ca8cd35285 100644
--- a/src/lib/elementary/elm_helper.c
+++ b/src/lib/elementary/elm_helper.c
@@ -41,7 +41,7 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator)
41EAPI Eina_Bool 41EAPI Eina_Bool
42elm_validator_regexp_helper(void *data, const Eo_Event *event) 42elm_validator_regexp_helper(void *data, const Eo_Event *event)
43{ 43{
44 Elm_Validate_Content *vc = event->event_info; 44 Elm_Validate_Content *vc = event->info;
45 Elm_Validator_Regexp *validator = (Elm_Validator_Regexp *)data; 45 Elm_Validator_Regexp *validator = (Elm_Validator_Regexp *)data;
46 46
47 validator->status = regexec(&validator->regex, vc->text, (size_t)0, NULL, 0) ? ELM_REG_NOMATCH : ELM_REG_NOERROR; 47 validator->status = regexec(&validator->regex, vc->text, (size_t)0, NULL, 0) ? ELM_REG_NOMATCH : ELM_REG_NOERROR;
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c
index 1e9d1a225e..75853fa348 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/elm_interface_atspi_accessible.c
@@ -346,7 +346,7 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
346 Eo_Event ev; 346 Eo_Event ev;
347 ev.obj = accessible; 347 ev.obj = accessible;
348 ev.desc = event; 348 ev.desc = event;
349 ev.event_info = event_info; 349 ev.info = event_info;
350 EINA_LIST_FOREACH(global_callbacks, l, hdl) 350 EINA_LIST_FOREACH(global_callbacks, l, hdl)
351 { 351 {
352 if (hdl->cb) 352 if (hdl->cb)
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index ee31bcc2d6..652f9b86d2 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -425,7 +425,7 @@ _menu_hide(void *data,
425static Eina_Bool 425static Eina_Bool
426_hover_dismissed_cb(void *data, const Eo_Event *event) 426_hover_dismissed_cb(void *data, const Eo_Event *event)
427{ 427{
428 _menu_hide(data, event->obj, event->event_info); 428 _menu_hide(data, event->obj, event->info);
429 eo_event_callback_call 429 eo_event_callback_call
430 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 430 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
431 eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL); 431 eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL);
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index b621476eb0..bca36b0b67 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -889,7 +889,7 @@ _text_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
889static Eina_Bool 889static Eina_Bool
890_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event) 890_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event)
891{ 891{
892 Evas_Event_Mouse_Move *ev = event->event_info; 892 Evas_Event_Mouse_Move *ev = event->info;
893 ELM_SPINNER_DATA_GET(data, sd); 893 ELM_SPINNER_DATA_GET(data, sd);
894 894
895 if ((ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) && sd->longpress_timer) 895 if ((ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) && sd->longpress_timer)
diff --git a/src/lib/elementary/elm_store.c b/src/lib/elementary/elm_store.c
index 422718dba3..a953f910c5 100644
--- a/src/lib/elementary/elm_store.c
+++ b/src/lib/elementary/elm_store.c
@@ -227,7 +227,7 @@ static Eina_Bool
227_store_genlist_item_realized(void *data, const Eo_Event *event) 227_store_genlist_item_realized(void *data, const Eo_Event *event)
228{ 228{
229 Elm_Store *st = data; 229 Elm_Store *st = data;
230 Elm_Object_Item *gli = event->event_info; 230 Elm_Object_Item *gli = event->info;
231 Elm_Store_Item *sti = elm_object_item_data_get(gli); 231 Elm_Store_Item *sti = elm_object_item_data_get(gli);
232 if (!sti) return EINA_TRUE; 232 if (!sti) return EINA_TRUE;
233 st->realized_count++; 233 st->realized_count++;
@@ -241,7 +241,7 @@ static Eina_Bool
241_store_genlist_item_unrealized(void *data, const Eo_Event *event) 241_store_genlist_item_unrealized(void *data, const Eo_Event *event)
242{ 242{
243 Elm_Store *st = data; 243 Elm_Store *st = data;
244 Elm_Object_Item *gli = event->event_info; 244 Elm_Object_Item *gli = event->info;
245 Elm_Store_Item *sti = elm_object_item_data_get(gli); 245 Elm_Store_Item *sti = elm_object_item_data_get(gli);
246 if (!sti) return EINA_TRUE; 246 if (!sti) return EINA_TRUE;
247 st->realized_count--; 247 st->realized_count--;
diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c
index 26c437e887..64023eb556 100644
--- a/src/lib/elementary/elm_view_form.c
+++ b/src/lib/elementary/elm_view_form.c
@@ -41,7 +41,7 @@ struct _Elm_View_Form_Data
41static Eina_Bool 41static Eina_Bool
42_efl_model_properties_change_cb(void *data, const Eo_Event *event) 42_efl_model_properties_change_cb(void *data, const Eo_Event *event)
43{ 43{
44 const Efl_Model_Property_Event *evt = event->event_info; 44 const Efl_Model_Property_Event *evt = event->info;
45 const Eina_Value *value; 45 const Eina_Value *value;
46 const char *prop; 46 const char *prop;
47 unsigned int i; 47 unsigned int i;
diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c
index dc03f2bd22..5a343763ee 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -160,7 +160,7 @@ _item_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part)
160static Eina_Bool 160static Eina_Bool
161_expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event) 161_expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
162{ 162{
163 Elm_Object_Item *item = event->event_info; 163 Elm_Object_Item *item = event->info;
164 View_List_ItemData *idata = elm_object_item_data_get(item); 164 View_List_ItemData *idata = elm_object_item_data_get(item);
165 Efl_Model_Load_Status st = EFL_MODEL_LOAD_STATUS_ERROR; 165 Efl_Model_Load_Status st = EFL_MODEL_LOAD_STATUS_ERROR;
166 166
@@ -183,7 +183,7 @@ _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
183static Eina_Bool 183static Eina_Bool
184_contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event) 184_contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
185{ 185{
186 Elm_Object_Item *item = event->event_info; 186 Elm_Object_Item *item = event->info;
187 View_List_ItemData *idata = elm_object_item_data_get(item); 187 View_List_ItemData *idata = elm_object_item_data_get(item);
188 188
189 eo_event_callback_array_del(idata->model, model_callbacks(), idata); 189 eo_event_callback_array_del(idata->model, model_callbacks(), idata);
@@ -194,7 +194,7 @@ _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
194static Eina_Bool 194static Eina_Bool
195_contracted_cb(void *data EINA_UNUSED, const Eo_Event *event) 195_contracted_cb(void *data EINA_UNUSED, const Eo_Event *event)
196{ 196{
197 Elm_Object_Item *glit = event->event_info; 197 Elm_Object_Item *glit = event->info;
198 elm_genlist_item_subitems_clear(glit); 198 elm_genlist_item_subitems_clear(glit);
199 return EINA_TRUE; 199 return EINA_TRUE;
200} 200}
@@ -218,7 +218,7 @@ static Eina_Bool
218_efl_model_properties_change_cb(void *data, const Eo_Event *event) 218_efl_model_properties_change_cb(void *data, const Eo_Event *event)
219{ 219{
220 View_List_ItemData *idata = data; 220 View_List_ItemData *idata = data;
221 Efl_Model_Property_Event *evt = event->event_info; 221 Efl_Model_Property_Event *evt = event->info;
222 222
223 EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_TRUE); 223 EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_TRUE);
224 EINA_SAFETY_ON_NULL_RETURN_VAL(evt, EINA_TRUE); 224 EINA_SAFETY_ON_NULL_RETURN_VAL(evt, EINA_TRUE);
@@ -285,7 +285,7 @@ static Eina_Bool
285_efl_model_load_status_change_cb(void *data, const Eo_Event *event) 285_efl_model_load_status_change_cb(void *data, const Eo_Event *event)
286{ 286{
287 View_List_ItemData *idata = data; 287 View_List_ItemData *idata = data;
288 Efl_Model_Load *load = event->event_info; 288 Efl_Model_Load *load = event->info;
289 289
290 if (load->status & EFL_MODEL_LOAD_STATUS_UNLOADED) 290 if (load->status & EFL_MODEL_LOAD_STATUS_UNLOADED)
291 { 291 {
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index e165af9178..1746844434 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -706,26 +706,26 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
706 706
707 if (event->desc == EVAS_OBJECT_EVENT_KEY_DOWN) 707 if (event->desc == EVAS_OBJECT_EVENT_KEY_DOWN)
708 { 708 {
709 Evas_Event_Key_Down *ev = event->event_info; 709 Evas_Event_Key_Down *ev = event->info;
710 event_flags = &(ev->event_flags); 710 event_flags = &(ev->event_flags);
711 type = EVAS_CALLBACK_KEY_DOWN; 711 type = EVAS_CALLBACK_KEY_DOWN;
712 } 712 }
713 else if (event->desc == EVAS_OBJECT_EVENT_KEY_UP) 713 else if (event->desc == EVAS_OBJECT_EVENT_KEY_UP)
714 { 714 {
715 Evas_Event_Key_Up *ev = event->event_info; 715 Evas_Event_Key_Up *ev = event->info;
716 event_flags = &(ev->event_flags); 716 event_flags = &(ev->event_flags);
717 type = EVAS_CALLBACK_KEY_UP; 717 type = EVAS_CALLBACK_KEY_UP;
718 } 718 }
719 else if (event->desc == EVAS_OBJECT_EVENT_MOUSE_WHEEL) 719 else if (event->desc == EVAS_OBJECT_EVENT_MOUSE_WHEEL)
720 { 720 {
721 Evas_Event_Mouse_Wheel *ev = event->event_info; 721 Evas_Event_Mouse_Wheel *ev = event->info;
722 event_flags = &(ev->event_flags); 722 event_flags = &(ev->event_flags);
723 type = EVAS_CALLBACK_MOUSE_WHEEL; 723 type = EVAS_CALLBACK_MOUSE_WHEEL;
724 } 724 }
725 else 725 else
726 return EO_CALLBACK_CONTINUE; 726 return EO_CALLBACK_CONTINUE;
727 727
728 elm_widget_event_propagate(obj, type, event->event_info, event_flags); 728 elm_widget_event_propagate(obj, type, event->info, event_flags);
729 729
730 return EO_CALLBACK_CONTINUE; 730 return EO_CALLBACK_CONTINUE;
731} 731}
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index d592bdefed..4e93495f6c 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -11,7 +11,7 @@ struct Eo.Event {
11 [[Parameter passed in event callbacks holding extra event parameters]] 11 [[Parameter passed in event callbacks holding extra event parameters]]
12 obj: Eo.Base *; [[The object the event was called on.]] 12 obj: Eo.Base *; [[The object the event was called on.]]
13 desc: const(Eo.Event_Description) *; [[The event description.]] 13 desc: const(Eo.Event_Description) *; [[The event description.]]
14 event_info: void *; [[Extra event information passed by the event caller.]] 14 info: void *; [[Extra event information passed by the event caller.]]
15} 15}
16 16
17type Eo.Event_Cb: __builtin_event_cb; [[An event callback prototype. 17type Eo.Event_Cb: __builtin_event_cb; [[An event callback prototype.
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 0740b39163..776e92a542 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -675,7 +675,7 @@ _eo_base_event_callback_call(Eo *obj_id, Eo_Base_Data *pd,
675 Eo_Event ev; 675 Eo_Event ev;
676 ev.obj = obj_id; 676 ev.obj = obj_id;
677 ev.desc = desc; 677 ev.desc = desc;
678 ev.event_info = event_info; 678 ev.info = event_info;
679 679
680 pd->walking_list++; 680 pd->walking_list++;
681 681
@@ -734,7 +734,7 @@ _eo_event_forwarder_callback(void *data, const Eo_Event *event)
734 Eo *new_obj = (Eo *) data; 734 Eo *new_obj = (Eo *) data;
735 Eina_Bool ret = EINA_FALSE; 735 Eina_Bool ret = EINA_FALSE;
736 736
737 ret = eo_event_callback_call(new_obj, event->desc, event->event_info); 737 ret = eo_event_callback_call(new_obj, event->desc, event->info);
738 738
739 return ret; 739 return ret;
740} 740}
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index db08309982..e334d1f382 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -62,7 +62,7 @@ static Eina_Bool
62_eo_evas_object_cb(void *data, const Eo_Event *event) 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(event->obj), event->obj, event->event_info); 65 if (info->func) info->func(info->data, evas_object_evas_get(event->obj), event->obj, event->info);
66 return EINA_TRUE; 66 return EINA_TRUE;
67} 67}
68 68
@@ -78,7 +78,7 @@ static Eina_Bool
78_eo_evas_cb(void *data, const Eo_Event *event) 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, event->obj, event->event_info); 81 if (info->func) info->func(info->data, event->obj, 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 ec7633d812..4f3bda9601 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -59,7 +59,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
59 const Eo_Event_Description *eo_desc = NULL; 59 const Eo_Event_Description *eo_desc = NULL;
60 Eina_Bool ret = EINA_FALSE; 60 Eina_Bool ret = EINA_FALSE;
61 61
62 target_node = (Evas_Canvas3D_Node *)event->event_info; 62 target_node = (Evas_Canvas3D_Node *)event->info;
63 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);
64 collision_list = (Eina_List *)data; 64 collision_list = (Eina_List *)data;
65 eo_desc = eo_base_legacy_only_event_description_get("collision"); 65 eo_desc = eo_base_legacy_only_event_description_get("collision");
@@ -81,7 +81,7 @@ _evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Eo_Ev
81{ 81{
82 Eina_Bool ret = EINA_FALSE; 82 Eina_Bool ret = EINA_FALSE;
83 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");
84 ret = eo_event_callback_call((Eo *)event->event_info, eo_desc, event->event_info); 84 ret = eo_event_callback_call((Eo *)event->info, eo_desc, event->info);
85 85
86 return ret; 86 return ret;
87} 87}
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index c423567c43..8085f41856 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -87,7 +87,7 @@ _animator_repeater(void *data, const Eo_Event *event)
87{ 87{
88 Evas_Object_Protected_Data *obj = data; 88 Evas_Object_Protected_Data *obj = data;
89 89
90 eo_event_callback_call(obj->object, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, event->event_info); 90 eo_event_callback_call(obj->object, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, event->info);
91 DBG("Emitting animator tick on %p.", obj->object); 91 DBG("Emitting animator tick on %p.", obj->object);
92 92
93 return EO_CALLBACK_CONTINUE; 93 return EO_CALLBACK_CONTINUE;
@@ -96,7 +96,7 @@ _animator_repeater(void *data, const Eo_Event *event)
96static Eina_Bool 96static Eina_Bool
97_check_event_catcher_add(void *data, const Eo_Event *event) 97_check_event_catcher_add(void *data, const Eo_Event *event)
98{ 98{
99 const Eo_Callback_Array_Item *array = event->event_info; 99 const Eo_Callback_Array_Item *array = event->info;
100 Evas_Object_Protected_Data *obj = data; 100 Evas_Object_Protected_Data *obj = data;
101 int i; 101 int i;
102 102
@@ -122,7 +122,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
122static Eina_Bool 122static Eina_Bool
123_check_event_catcher_del(void *data, const Eo_Event *event) 123_check_event_catcher_del(void *data, const Eo_Event *event)
124{ 124{
125 const Eo_Callback_Array_Item *array = event->event_info; 125 const Eo_Callback_Array_Item *array = event->info;
126 Evas_Object_Protected_Data *obj = data; 126 Evas_Object_Protected_Data *obj = data;
127 int i; 127 int i;
128 128
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 461338d5c0..752f349389 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -64,7 +64,7 @@ static Eina_Bool
64_eo_evas_smart_cb(void *data, const Eo_Event *event) 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, event->obj, event->event_info); 67 if (info->func) info->func(info->data, event->obj, event->info);
68 return EINA_TRUE; 68 return EINA_TRUE;
69} 69}
70 70
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index c5eff086be..10aa752bee 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -27,7 +27,7 @@ _efl_vg_base_property_changed(void *data, const Eo_Event *event)
27 pd->changed = EINA_TRUE; 27 pd->changed = EINA_TRUE;
28 28
29 parent = eo_parent_get(event->obj); 29 parent = eo_parent_get(event->obj);
30 eo_event_callback_call(parent, event->desc, event->event_info); 30 eo_event_callback_call(parent, event->desc, event->info);
31 return EINA_TRUE; 31 return EINA_TRUE;
32} 32}
33 33
diff --git a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index 198f095a28..2301807f06 100644
--- a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -93,7 +93,7 @@ _diskselector_cb(void *data EINA_UNUSED, const Eo_Event *event)
93 struct tm curr_time; 93 struct tm curr_time;
94 const char *fmt; 94 const char *fmt;
95 95
96 disk_data = (DiskItem_Data *)elm_object_item_data_get(event->event_info); 96 disk_data = (DiskItem_Data *)elm_object_item_data_get(event->info);
97 if (!disk_data || !(disk_data->ctx_mod)) return EINA_FALSE; 97 if (!disk_data || !(disk_data->ctx_mod)) return EINA_FALSE;
98 98
99 elm_datetime_value_get(disk_data->ctx_mod->mod_data.base, &curr_time); 99 elm_datetime_value_get(disk_data->ctx_mod->mod_data.base, &curr_time);
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index dc89c6f14a..c4b3686ae8 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -61,7 +61,7 @@ static Eina_Bool
61static Eina_Bool 61static Eina_Bool
62_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event) 62_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
63{ 63{
64 Efl_Model_Load *st = event->event_info; 64 Efl_Model_Load *st = 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)
@@ -113,7 +113,7 @@ _load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
113static Eina_Bool 113static Eina_Bool
114_properties_change_cb(void *data EINA_UNUSED, const Eo_Event *event) 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->event_info; 116 const Efl_Model_Property_Event *evt = (Efl_Model_Property_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;
@@ -137,7 +137,7 @@ _properties_change_cb(void *data EINA_UNUSED, const Eo_Event *event)
137static Eina_Bool 137static Eina_Bool
138_children_count_cb(void *data EINA_UNUSED, const Eo_Event *event) 138_children_count_cb(void *data EINA_UNUSED, const Eo_Event *event)
139{ 139{
140 unsigned int *len = (unsigned int *)event->event_info; 140 unsigned int *len = (unsigned int *)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);
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index dd92ef0a51..47b1509c8d 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -21,7 +21,7 @@ const char* tmpdir = NULL;
21static Eina_Bool 21static Eina_Bool
22_load_monitor_status_cb(void *data, const Eo_Event *event) 22_load_monitor_status_cb(void *data, const Eo_Event *event)
23{ 23{
24 Efl_Model_Load* st = event->event_info; 24 Efl_Model_Load* st = 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;
@@ -51,7 +51,7 @@ _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->event_info; 54 Efl_Model_Children_Event* evt = event->info;
55 55
56 Eina_Bool b; 56 Eina_Bool b;
57 b = efl_model_load_status_get(evt->child); 57 b = efl_model_load_status_get(evt->child);
@@ -75,7 +75,7 @@ _children_removed_cb(void *data EINA_UNUSED, const Eo_Event *event)
75static Eina_Bool 75static Eina_Bool
76_children_added_cb(void *data EINA_UNUSED, const Eo_Event *event) 76_children_added_cb(void *data EINA_UNUSED, const Eo_Event *event)
77{ 77{
78 Efl_Model_Children_Event* evt = event->event_info; 78 Efl_Model_Children_Event* evt = event->info;
79 if (evt == NULL) 79 if (evt == NULL)
80 return EINA_TRUE; 80 return EINA_TRUE;
81 81
@@ -88,7 +88,7 @@ _children_added_cb(void *data EINA_UNUSED, const Eo_Event *event)
88static Eina_Bool 88static Eina_Bool
89_children_count_cb(void *data EINA_UNUSED, const Eo_Event *event) 89_children_count_cb(void *data EINA_UNUSED, const Eo_Event *event)
90{ 90{
91 unsigned int *len = event->event_info; 91 unsigned int *len = 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;
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index b89f1e9ac9..8dc5e15448 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -34,7 +34,7 @@ _event_load_status_quit_cb(void *data, const Eo_Event *event)
34{ 34{
35 printf("_event_load_status_quit_cb\n"); 35 printf("_event_load_status_quit_cb\n");
36 Efl_Model_Load_Status expected_status = (Efl_Model_Load_Status)data; 36 Efl_Model_Load_Status expected_status = (Efl_Model_Load_Status)data;
37 Efl_Model_Load *actual_load = (Efl_Model_Load*)event->event_info; 37 Efl_Model_Load *actual_load = (Efl_Model_Load*)event->info;
38 38
39 if (expected_status == actual_load->status) 39 if (expected_status == actual_load->status)
40 { 40 {
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index 614fda9cc2..c56ee4636d 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -86,7 +86,7 @@ _children_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
86 if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED) 86 if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED)
87 return EINA_TRUE; 87 return EINA_TRUE;
88 88
89 ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->event_info; 89 ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info;
90 current = event->obj; 90 current = event->obj;
91 counter++; 91 counter++;
92 92
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index f88e045836..8a8aad5659 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -134,7 +134,7 @@ broadcast_event(Emotion_Event ev)
134static Eina_Bool 134static Eina_Bool
135bg_key_down(void *data EINA_UNUSED, const Eo_Event *event) 135bg_key_down(void *data EINA_UNUSED, const Eo_Event *event)
136{ 136{
137 Evas_Event_Key_Down *ev = event->event_info; 137 Evas_Event_Key_Down *ev = event->info;
138 Eina_List *l; 138 Eina_List *l;
139 Evas_Object *o; 139 Evas_Object *o;
140 140
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index 6f9e914415..b32d5f995f 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -15,7 +15,7 @@ static int cb_called = EINA_FALSE;
15static Eina_Bool 15static Eina_Bool
16_a_changed_cb(void *data, const Eo_Event *event) 16_a_changed_cb(void *data, const Eo_Event *event)
17{ 17{
18 int new_a = *((int *) event->event_info); 18 int new_a = *((int *) event->info);
19 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);
20 20
21 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 5d40331b03..453eb1ab97 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -18,7 +18,7 @@ _null_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
18static Eina_Bool 18static Eina_Bool
19_a_changed_cb(void *data, const Eo_Event *event) 19_a_changed_cb(void *data, const Eo_Event *event)
20{ 20{
21 int new_a = *((int *) event->event_info); 21 int new_a = *((int *) event->info);
22 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);
23 23
24 cb_count++; 24 cb_count++;
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 458b95c008..b56a87b89f 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -30,7 +30,7 @@ Eina_Bool
30_cb_added(void *data EINA_UNUSED, const Eo_Event *event) 30_cb_added(void *data EINA_UNUSED, const Eo_Event *event)
31{ 31{
32 Simple_Public_Data *pd = eo_data_scope_get(event->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->event_info; 33 const Eo_Callback_Array_Item *callback_array = event->info;
34 34
35 if (callback_array->desc != EV_A_CHANGED) 35 if (callback_array->desc != EV_A_CHANGED)
36 return EINA_TRUE; 36 return EINA_TRUE;
@@ -45,7 +45,7 @@ Eina_Bool
45_cb_deled(void *data EINA_UNUSED, const Eo_Event *event) 45_cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
46{ 46{
47 Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS); 47 Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS);
48 const Eo_Callback_Array_Item *callback_array = event->event_info; 48 const Eo_Callback_Array_Item *callback_array = event->info;
49 49
50 if (callback_array->desc != EV_A_CHANGED) 50 if (callback_array->desc != EV_A_CHANGED)
51 return EINA_TRUE; 51 return EINA_TRUE;
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 0a9b74c7d5..fcaa115e99 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -82,7 +82,7 @@ _eo_signals_eo_del_cb(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED
82Eina_Bool 82Eina_Bool
83_eo_signals_cb_added_deled(void *data, const Eo_Event *event) 83_eo_signals_cb_added_deled(void *data, const Eo_Event *event)
84{ 84{
85 const Eo_Callback_Array_Item *callback_array = event->event_info; 85 const Eo_Callback_Array_Item *callback_array = 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));
diff --git a/src/tests/eolian_cxx/callback.c b/src/tests/eolian_cxx/callback.c
index a6e7ce1ebd..76b9f9db67 100644
--- a/src/tests/eolian_cxx/callback.c
+++ b/src/tests/eolian_cxx/callback.c
@@ -19,7 +19,7 @@ typedef struct _Callback_Data Callback_Data;
19 19
20static Eina_Bool _callback_callback_added(void* data EINA_UNUSED, Eo_Event const* event) 20static Eina_Bool _callback_callback_added(void* data EINA_UNUSED, Eo_Event const* event)
21{ 21{
22 Callback_Data* pd = event->event_info; 22 Callback_Data* pd = event->info;
23 ++pd->callbacks; 23 ++pd->callbacks;
24 eo_event_callback_call(event->obj, CALLBACK_EVENT_CALL_ON_ADD, &pd->callbacks); 24 eo_event_callback_call(event->obj, CALLBACK_EVENT_CALL_ON_ADD, &pd->callbacks);
25 return EINA_TRUE; 25 return EINA_TRUE;