summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-02-29 11:32:52 +0000
committerTom Hacohen <tom@stosb.com>2016-02-29 11:33:41 +0000
commitc0363a2979ba37d4c2e8c525ef6388a003a79a06 (patch)
tree85fd0b18276ead06c1c424381b2976c198443302
parentc45d730af6c574c3208f954ae7b943ca0ca61c8f (diff)
Eo events: Migrate all of elm to the new event callback signatures
-rw-r--r--src/bin/test_anim.c10
-rw-r--r--src/bin/test_application_server.c22
-rw-r--r--src/bin/test_entry.c9
-rw-r--r--src/bin/test_task_switcher.c12
-rw-r--r--src/bin/test_win_plug.c4
-rw-r--r--src/examples/filemvc.c6
-rw-r--r--src/lib/elc_combobox.c21
-rw-r--r--src/lib/elc_fileselector.c104
-rw-r--r--src/lib/elc_fileselector_button.c10
-rw-r--r--src/lib/elc_fileselector_entry.c19
-rw-r--r--src/lib/elc_hoversel.c22
-rw-r--r--src/lib/elc_multibuttonentry.c24
-rw-r--r--src/lib/elc_naviframe.c13
-rw-r--r--src/lib/elc_player.c80
-rw-r--r--src/lib/elc_popup.c24
-rw-r--r--src/lib/elm_app_server.c4
-rw-r--r--src/lib/elm_atspi_bridge.c116
-rw-r--r--src/lib/elm_box.c20
-rw-r--r--src/lib/elm_cnp.c6
-rw-r--r--src/lib/elm_color_class.c14
-rw-r--r--src/lib/elm_colorselector.c54
-rw-r--r--src/lib/elm_conform.c28
-rw-r--r--src/lib/elm_dayselector.c3
-rw-r--r--src/lib/elm_entry.c25
-rw-r--r--src/lib/elm_frame.c3
-rw-r--r--src/lib/elm_genlist.c5
-rw-r--r--src/lib/elm_helper.c7
-rw-r--r--src/lib/elm_helper.h2
-rw-r--r--src/lib/elm_interface_atspi_accessible.c10
-rw-r--r--src/lib/elm_interface_atspi_image.c2
-rw-r--r--src/lib/elm_interface_scrollable.c38
-rw-r--r--src/lib/elm_map.c10
-rw-r--r--src/lib/elm_menu.c12
-rw-r--r--src/lib/elm_panel.c4
-rw-r--r--src/lib/elm_photo.c3
-rw-r--r--src/lib/elm_photocam.c14
-rw-r--r--src/lib/elm_spinner.c40
-rw-r--r--src/lib/elm_store.c8
-rw-r--r--src/lib/elm_video.c48
-rw-r--r--src/lib/elm_view_form.c4
-rw-r--r--src/lib/elm_view_list.c37
-rw-r--r--src/lib/elm_widget.c79
-rw-r--r--src/lib/elm_win.c2
-rw-r--r--src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c28
-rw-r--r--src/modules/prefs/elm_button.c6
-rw-r--r--src/modules/prefs/elm_check.c6
-rw-r--r--src/modules/prefs/elm_datetime.c6
-rw-r--r--src/modules/prefs/elm_entry.c6
-rw-r--r--src/modules/prefs/elm_slider.c6
-rw-r--r--src/modules/prefs/elm_spinner.c6
50 files changed, 398 insertions, 644 deletions
diff --git a/src/bin/test_anim.c b/src/bin/test_anim.c
index 6d6cd3976..8f2428155 100644
--- a/src/bin/test_anim.c
+++ b/src/bin/test_anim.c
@@ -11,7 +11,7 @@ static const char *names[] =
11}; 11};
12 12
13static Eina_Bool 13static Eina_Bool
14_anim_tick(void *data EINA_UNUSED, Eo *win, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 14_anim_tick(void *data EINA_UNUSED, const Eo_Event *event)
15{ 15{
16 Evas_Object *bub, *sh; 16 Evas_Object *bub, *sh;
17 Evas_Coord x, y, w, h, vw, vh; 17 Evas_Coord x, y, w, h, vw, vh;
@@ -19,18 +19,18 @@ _anim_tick(void *data EINA_UNUSED, Eo *win, const Eo_Event_Description *desc EIN
19 double lx, ly; 19 double lx, ly;
20 unsigned int i; 20 unsigned int i;
21 21
22 evas_output_viewport_get(evas_object_evas_get(win), 0, 0, &vw, &vh); 22 evas_output_viewport_get(evas_object_evas_get(event->obj), 0, 0, &vw, &vh);
23 r = 48; 23 r = 48;
24 t = ecore_loop_time_get(); 24 t = ecore_loop_time_get();
25 fac = 2.0 / (double)((sizeof(names) / sizeof(char *) / 2)); 25 fac = 2.0 / (double)((sizeof(names) / sizeof(char *) / 2));
26 evas_pointer_canvas_xy_get(evas_object_evas_get(win), &x, &y); 26 evas_pointer_canvas_xy_get(evas_object_evas_get(event->obj), &x, &y);
27 lx = x; 27 lx = x;
28 ly = y; 28 ly = y;
29 29
30 for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++) 30 for (i = 0; i < (sizeof(names) / sizeof(char *) / 2); i++)
31 { 31 {
32 bub = evas_object_data_get(win, names[i * 2]); 32 bub = evas_object_data_get(event->obj, names[i * 2]);
33 sh = evas_object_data_get(win, names[(i * 2) + 1]); 33 sh = evas_object_data_get(event->obj, names[(i * 2) + 1]);
34 zz = (((2 + sin(t * 6 + (M_PI * (i * fac)))) / 3) * 64) * 2; 34 zz = (((2 + sin(t * 6 + (M_PI * (i * fac)))) / 3) * 64) * 2;
35 xx = (cos(t * 4 + (M_PI * (i * fac))) * r) * 2; 35 xx = (cos(t * 4 + (M_PI * (i * fac))) * r) * 2;
36 yy = (sin(t * 6 + (M_PI * (i * fac))) * r) * 2; 36 yy = (sin(t * 6 + (M_PI * (i * fac))) * r) * 2;
diff --git a/src/bin/test_application_server.c b/src/bin/test_application_server.c
index 114f32b95..0d7874e6b 100644
--- a/src/bin/test_application_server.c
+++ b/src/bin/test_application_server.c
@@ -40,17 +40,17 @@ _window_create(App_View_Context *ctx)
40} 40}
41 41
42static Eina_Bool 42static Eina_Bool
43_close_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 43_close_cb(void *data, const Eo_Event *event)
44{ 44{
45 App_View_Context *ctx = data; 45 App_View_Context *ctx = data;
46 if (ctx->win) 46 if (ctx->win)
47 evas_object_del(ctx->win); 47 evas_object_del(ctx->win);
48 eo_del(obj); 48 eo_del(event->obj);
49 return EINA_TRUE; 49 return EINA_TRUE;
50} 50}
51 51
52static Eina_Bool 52static Eina_Bool
53_pause_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 53_pause_cb(void *data, const Eo_Event *event EINA_UNUSED)
54{ 54{
55 App_View_Context *ctx = data; 55 App_View_Context *ctx = data;
56 _text_update(ctx, "paused"); 56 _text_update(ctx, "paused");
@@ -58,7 +58,7 @@ _pause_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA
58} 58}
59 59
60static Eina_Bool 60static Eina_Bool
61_resume_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 61_resume_cb(void *data, const Eo_Event *event)
62{ 62{
63 App_View_Context *ctx = data; 63 App_View_Context *ctx = data;
64 64
@@ -66,7 +66,7 @@ _resume_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, vo
66 if (!ctx->win) 66 if (!ctx->win)
67 { 67 {
68 _window_create(ctx); 68 _window_create(ctx);
69 eo_do(obj, elm_app_server_view_window_set(ctx->win)); 69 eo_do(event->obj, elm_app_server_view_window_set(ctx->win));
70 } 70 }
71 71
72 _text_update(ctx, "alive"); 72 _text_update(ctx, "alive");
@@ -74,13 +74,13 @@ _resume_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, vo
74} 74}
75 75
76static Eina_Bool 76static Eina_Bool
77_view_del_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 77_view_del_cb(void *data, const Eo_Event *event)
78{ 78{
79 App_View_Context *ctx = data; 79 App_View_Context *ctx = data;
80 80
81 if (ctx->win) 81 if (ctx->win)
82 evas_object_del(ctx->win); 82 evas_object_del(ctx->win);
83 eo_do(obj, elm_app_server_view_window_set(NULL)); 83 eo_do(event->obj, elm_app_server_view_window_set(NULL));
84 eina_stringshare_del(ctx->view_name); 84 eina_stringshare_del(ctx->view_name);
85 free(ctx); 85 free(ctx);
86 return EINA_TRUE; 86 return EINA_TRUE;
@@ -122,16 +122,16 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
122} 122}
123 123
124static Eina_Bool 124static Eina_Bool
125_terminate_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 125_terminate_cb(void *data EINA_UNUSED, const Eo_Event *event)
126{ 126{
127 const char *title = NULL; 127 const char *title = NULL;
128 128
129 printf("terminate cb\n"); 129 printf("terminate cb\n");
130 eo_do(obj, elm_app_server_save(), 130 eo_do(event->obj, elm_app_server_save(),
131 title = elm_app_server_title_get()); 131 title = elm_app_server_title_get());
132 132
133 printf("Closing: %s\n", title); 133 printf("Closing: %s\n", title);
134 eo_unref(obj); 134 eo_unref(event->obj);
135 return EINA_TRUE; 135 return EINA_TRUE;
136} 136}
137 137
@@ -171,7 +171,7 @@ test_application_server_common(const char *pkg)
171} 171}
172 172
173static Eina_Bool 173static Eina_Bool
174_server_del_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 174_server_del_cb(void *data, const Eo_Event *event EINA_UNUSED)
175{ 175{
176 Elm_App_Server **server = data; 176 Elm_App_Server **server = data;
177 *server = NULL; 177 *server = NULL;
diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c
index f79505e81..b92f933df 100644
--- a/src/bin/test_entry.c
+++ b/src/bin/test_entry.c
@@ -333,12 +333,11 @@ _end_hide_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
333} 333}
334 334
335static Eina_Bool 335static Eina_Bool
336_context_menu_show_cb(void *data EINA_UNUSED, Eo *obj, 336_context_menu_show_cb(void *data EINA_UNUSED, const Eo_Event *event)
337 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
338{ 337{
339 elm_entry_context_menu_clear(obj); 338 elm_entry_context_menu_clear(event->obj);
340 elm_entry_context_menu_item_add(obj, "MenuD1", NULL, ELM_ICON_NONE, _item_cb, NULL); 339 elm_entry_context_menu_item_add(event->obj, "MenuD1", NULL, ELM_ICON_NONE, _item_cb, NULL);
341 elm_entry_context_menu_item_add(obj, "MenuD2", NULL, ELM_ICON_NONE, _item_cb, NULL); 340 elm_entry_context_menu_item_add(event->obj, "MenuD2", NULL, ELM_ICON_NONE, _item_cb, NULL);
342 return EO_CALLBACK_CONTINUE; 341 return EO_CALLBACK_CONTINUE;
343} 342}
344 343
diff --git a/src/bin/test_task_switcher.c b/src/bin/test_task_switcher.c
index ff7d7e45c..535e88e09 100644
--- a/src/bin/test_task_switcher.c
+++ b/src/bin/test_task_switcher.c
@@ -34,11 +34,11 @@ static void _btn_resume_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event
34} 34}
35 35
36static Eina_Bool 36static Eina_Bool
37_app_view_prop_changed_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 37_app_view_prop_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
38{ 38{
39 Elm_App_View_State state = ELM_APP_VIEW_STATE_UNKNOWN; 39 Elm_App_View_State state = ELM_APP_VIEW_STATE_UNKNOWN;
40 40
41 eo_do(obj, state = elm_app_client_view_state_get()); 41 eo_do(event->obj, state = elm_app_client_view_state_get());
42 42
43 if (state == ELM_APP_VIEW_STATE_CLOSED) 43 if (state == ELM_APP_VIEW_STATE_CLOSED)
44 { 44 {
@@ -47,7 +47,7 @@ _app_view_prop_changed_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Descri
47 evas_object_del(props); 47 evas_object_del(props);
48 } 48 }
49 else 49 else
50 _app_view_clicked(obj, NULL, NULL); 50 _app_view_clicked(event->obj, NULL, NULL);
51 51
52 return EINA_TRUE; 52 return EINA_TRUE;
53} 53}
@@ -274,10 +274,10 @@ _app_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
274} 274}
275 275
276static Eina_Bool 276static Eina_Bool
277_view_list_update_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 277_view_list_update_cb(void *data EINA_UNUSED, const Eo_Event *event)
278{ 278{
279 if (app_selected == obj) 279 if (app_selected == event->obj)
280 _app_clicked(obj, NULL, NULL); 280 _app_clicked(event->obj, NULL, NULL);
281 return EINA_TRUE; 281 return EINA_TRUE;
282} 282}
283 283
diff --git a/src/bin/test_win_plug.c b/src/bin/test_win_plug.c
index dd5d5d3f1..25fad1899 100644
--- a/src/bin/test_win_plug.c
+++ b/src/bin/test_win_plug.c
@@ -144,9 +144,9 @@ create_handles(Evas_Object *obj)
144} 144}
145 145
146static Eina_Bool 146static Eina_Bool
147_notify_end(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 147_notify_end(void *data EINA_UNUSED, const Eo_Event *event)
148{ 148{
149 eo_del(obj); 149 eo_del(event->obj);
150 return EINA_FALSE; 150 return EINA_FALSE;
151} 151}
152 152
diff --git a/src/examples/filemvc.c b/src/examples/filemvc.c
index 2475d6926..a1e90b793 100644
--- a/src/examples/filemvc.c
+++ b/src/examples/filemvc.c
@@ -47,10 +47,10 @@ _filter_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, const Eina_Fil
47} 47}
48 48
49static Eina_Bool 49static Eina_Bool
50_list_selected_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 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_info; 53 Eo *child = event->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");
@@ -59,7 +59,7 @@ _list_selected_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_De
59} 59}
60 60
61static Eina_Bool 61static Eina_Bool
62_tree_selected_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 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_info; 65 Eo *child = event_info;
diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c
index f950f5826..cd8e32cbe 100644
--- a/src/lib/elc_combobox.c
+++ b/src/lib/elc_combobox.c
@@ -92,13 +92,11 @@ _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
92} 92}
93 93
94static Eina_Bool 94static Eina_Bool
95_on_hover_clicked(void *data, 95_on_hover_clicked(void *data, const Eo_Event *event)
96 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
97 void *event_info EINA_UNUSED)
98{ 96{
99 const char *dismissstr; 97 const char *dismissstr;
100 98
101 dismissstr = elm_layout_data_get(obj, "dismiss"); 99 dismissstr = elm_layout_data_get(event->obj, "dismiss");
102 100
103 if (!dismissstr || strcmp(dismissstr, "on")) 101 if (!dismissstr || strcmp(dismissstr, "on"))
104 elm_combobox_hover_end(data); // for backward compatibility 102 elm_combobox_hover_end(data); // for backward compatibility
@@ -210,8 +208,7 @@ _on_item_pressed(void *data , Evas_Object *obj EINA_UNUSED, void *event)
210} 208}
211 209
212static Eina_Bool 210static Eina_Bool
213_gl_filter_finished_cb(void *data, Eo *obj EINA_UNUSED, 211_gl_filter_finished_cb(void *data, const Eo_Event *event)
214 const Eo_Event_Description *desc EINA_UNUSED, void *event)
215{ 212{
216 char buf[1024]; 213 char buf[1024];
217 ELM_COMBOBOX_DATA_GET(data, sd); 214 ELM_COMBOBOX_DATA_GET(data, sd);
@@ -224,7 +221,7 @@ _gl_filter_finished_cb(void *data, Eo *obj EINA_UNUSED,
224 return EINA_TRUE; 221 return EINA_TRUE;
225 } 222 }
226 223
227 eo_do(data, eo_event_callback_call(ELM_COMBOBOX_EVENT_FILTER_DONE, event)); 224 eo_do(data, eo_event_callback_call(ELM_COMBOBOX_EVENT_FILTER_DONE, event->event_info));
228 225
229 if (sd->count > 0) 226 if (sd->count > 0)
230 { 227 {
@@ -245,8 +242,7 @@ _gl_filter_finished_cb(void *data, Eo *obj EINA_UNUSED,
245} 242}
246 243
247static Eina_Bool 244static Eina_Bool
248_on_aborted(void *data, Eo *obj EINA_UNUSED, 245_on_aborted(void *data, const Eo_Event *event EINA_UNUSED)
249 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
250{ 246{
251 ELM_COMBOBOX_DATA_GET(data, sd); 247 ELM_COMBOBOX_DATA_GET(data, sd);
252 if (sd->expanded) elm_combobox_hover_end(data); 248 if (sd->expanded) elm_combobox_hover_end(data);
@@ -254,17 +250,14 @@ _on_aborted(void *data, Eo *obj EINA_UNUSED,
254} 250}
255 251
256static Eina_Bool 252static Eina_Bool
257_on_changed(void *data, Eo *obj EINA_UNUSED, 253_on_changed(void *data, const Eo_Event *event EINA_UNUSED)
258 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
259{ 254{
260 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_CHANGED, NULL)); 255 eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_CHANGED, NULL));
261 return EINA_TRUE; 256 return EINA_TRUE;
262} 257}
263 258
264static Eina_Bool 259static Eina_Bool
265_on_clicked(void *data, 260_on_clicked(void *data, const Eo_Event *event EINA_UNUSED)
266 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
267 void *event_info EINA_UNUSED)
268{ 261{
269 elm_combobox_hover_begin(data); 262 elm_combobox_hover_begin(data);
270 return EINA_TRUE; 263 return EINA_TRUE;
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 0c4002e2d..6922594c1 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -54,10 +54,8 @@ static const Elm_Action key_actions[] = {
54 {NULL, NULL} 54 {NULL, NULL}
55}; 55};
56 56
57static Eina_Bool _ok(void *data, 57static Eina_Bool _ok(void *data, const Eo_Event *event);
58 Eo *obj, const Eo_Event_Description *desc, void *event_info); 58static Eina_Bool _canc(void *data, const Eo_Event *event);
59static Eina_Bool _canc(void *data,
60 Eo *obj, const Eo_Event_Description *desc, void *event_info);
61 59
62/* final routine on deletion */ 60/* final routine on deletion */
63static void 61static void
@@ -156,14 +154,16 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
156static Eina_Bool 154static Eina_Bool
157_key_action_select(Evas_Object *obj, const char *params EINA_UNUSED) 155_key_action_select(Evas_Object *obj, const char *params EINA_UNUSED)
158{ 156{
159 _ok(obj, NULL, NULL, NULL); 157 Eo_Event event = {0};
158 _ok(obj, &event);
160 return EINA_TRUE; 159 return EINA_TRUE;
161} 160}
162 161
163static Eina_Bool 162static Eina_Bool
164_key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED) 163_key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
165{ 164{
166 _canc(obj, NULL, NULL, NULL); 165 Eo_Event event = {0};
166 _canc(obj, &event);
167 return EINA_TRUE; 167 return EINA_TRUE;
168} 168}
169 169
@@ -704,11 +704,9 @@ _populate(Evas_Object *obj,
704} 704}
705 705
706static Eina_Bool 706static Eina_Bool
707_on_list_expanded(void *data, 707_on_list_expanded(void *data, const Eo_Event *event)
708 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
709 void *event_info)
710{ 708{
711 Elm_Object_Item *it = event_info; 709 Elm_Object_Item *it = event->event_info;
712 const char *path = elm_object_item_data_get(it); 710 const char *path = elm_object_item_data_get(it);
713 711
714 _populate(data, path, it, NULL); 712 _populate(data, path, it, NULL);
@@ -717,11 +715,9 @@ _on_list_expanded(void *data,
717} 715}
718 716
719static Eina_Bool 717static Eina_Bool
720_on_list_contracted(void *data EINA_UNUSED, 718_on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event)
721 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
722 void *event_info)
723{ 719{
724 Elm_Object_Item *it = event_info; 720 Elm_Object_Item *it = event->event_info;
725 721
726 elm_genlist_item_subitems_clear(it); 722 elm_genlist_item_subitems_clear(it);
727 723
@@ -729,11 +725,9 @@ _on_list_contracted(void *data EINA_UNUSED,
729} 725}
730 726
731static Eina_Bool 727static Eina_Bool
732_on_list_expand_req(void *data EINA_UNUSED, 728_on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event)
733 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
734 void *event_info)
735{ 729{
736 Elm_Object_Item *it = event_info; 730 Elm_Object_Item *it = event->event_info;
737 731
738 elm_genlist_item_expanded_set(it, EINA_TRUE); 732 elm_genlist_item_expanded_set(it, EINA_TRUE);
739 733
@@ -741,11 +735,9 @@ _on_list_expand_req(void *data EINA_UNUSED,
741} 735}
742 736
743static Eina_Bool 737static Eina_Bool
744_on_list_contract_req(void *data EINA_UNUSED, 738_on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event)
745 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
746 void *event_info)
747{ 739{
748 Elm_Object_Item *it = event_info; 740 Elm_Object_Item *it = event->event_info;
749 741
750 elm_genlist_item_expanded_set(it, EINA_FALSE); 742 elm_genlist_item_expanded_set(it, EINA_FALSE);
751 743
@@ -794,12 +786,10 @@ _schedule_populate(Evas_Object *fs,
794} 786}
795 787
796static Eina_Bool 788static Eina_Bool
797_on_item_activated(void *data, 789_on_item_activated(void *data, const Eo_Event *event)
798 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
799 void *event_info)
800{ 790{
801 //This event_info could be a list or gengrid item 791 //This event_info could be a list or gengrid item
802 Elm_Object_Item *it = event_info; 792 Elm_Object_Item *it = event->event_info;
803 const char *path; 793 const char *path;
804 Eina_Bool is_dir; 794 Eina_Bool is_dir;
805 795
@@ -852,12 +842,10 @@ _clear_selections(Elm_Fileselector_Data *sd, Elm_Object_Item *last_selected)
852} 842}
853 843
854static Eina_Bool 844static Eina_Bool
855_on_item_selected(void *data, 845_on_item_selected(void *data, const Eo_Event *event)
856 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
857 void *event_info)
858{ 846{
859 //This event_info could be a list or gengrid item 847 //This event_info could be a list or gengrid item
860 Elm_Object_Item *it = event_info; 848 Elm_Object_Item *it = event->event_info;
861 const char *path; 849 const char *path;
862 char *parent_path; 850 char *parent_path;
863 Eina_Bool is_dir; 851 Eina_Bool is_dir;
@@ -942,15 +930,13 @@ _on_item_selected(void *data,
942} 930}
943 931
944static Eina_Bool 932static Eina_Bool
945_on_item_unselected(void *data, 933_on_item_unselected(void *data, const Eo_Event *event)
946 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
947 void *event_info)
948{ 934{
949 Eina_List *li, *l; 935 Eina_List *li, *l;
950 char *path; 936 char *path;
951 const char *unselected_path; 937 const char *unselected_path;
952 Eina_Strbuf *buf; 938 Eina_Strbuf *buf;
953 Elm_Object_Item *it = event_info; 939 Elm_Object_Item *it = event->event_info;
954 Eina_Bool first = EINA_TRUE; 940 Eina_Bool first = EINA_TRUE;
955 941
956 ELM_FILESELECTOR_DATA_GET(data, sd); 942 ELM_FILESELECTOR_DATA_GET(data, sd);
@@ -986,9 +972,7 @@ _on_item_unselected(void *data,
986} 972}
987 973
988static Eina_Bool 974static Eina_Bool
989_on_dir_up(void *data, 975_on_dir_up(void *data, const Eo_Event *event EINA_UNUSED)
990 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
991 void *event_info EINA_UNUSED)
992{ 976{
993 Evas_Object *fs = data; 977 Evas_Object *fs = data;
994 char *parent; 978 char *parent;
@@ -1003,9 +987,7 @@ _on_dir_up(void *data,
1003} 987}
1004 988
1005static Eina_Bool 989static Eina_Bool
1006_home(void *data, 990_home(void *data, const Eo_Event *event EINA_UNUSED)
1007 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
1008 void *event_info EINA_UNUSED)
1009{ 991{
1010 Evas_Object *fs = data; 992 Evas_Object *fs = data;
1011 993
@@ -1030,9 +1012,7 @@ _current_filter_changed(void *data,
1030} 1012}
1031 1013
1032static Eina_Bool 1014static Eina_Bool
1033_ok(void *data, 1015_ok(void *data, const Eo_Event *event EINA_UNUSED)
1034 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
1035 void *event_info EINA_UNUSED)
1036{ 1016{
1037 const char *name; 1017 const char *name;
1038 const char *selection = NULL; 1018 const char *selection = NULL;
@@ -1065,9 +1045,7 @@ _ok(void *data,
1065} 1045}
1066 1046
1067static Eina_Bool 1047static Eina_Bool
1068_canc(void *data, 1048_canc(void *data, const Eo_Event *event EINA_UNUSED)
1069 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
1070 void *event_info EINA_UNUSED)
1071{ 1049{
1072 Evas_Object *fs = data; 1050 Evas_Object *fs = data;
1073 1051
@@ -1077,9 +1055,7 @@ _canc(void *data,
1077} 1055}
1078 1056
1079static Eina_Bool 1057static Eina_Bool
1080_on_text_activated(void *data, 1058_on_text_activated(void *data, const Eo_Event *event)
1081 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
1082 void *event_info EINA_UNUSED)
1083{ 1059{
1084 Evas_Object *fs = data; 1060 Evas_Object *fs = data;
1085 const char *p, *path; 1061 const char *p, *path;
@@ -1087,7 +1063,7 @@ _on_text_activated(void *data,
1087 1063
1088 ELM_FILESELECTOR_DATA_GET(fs, sd); 1064 ELM_FILESELECTOR_DATA_GET(fs, sd);
1089 1065
1090 path = elm_widget_part_text_get(obj, NULL); 1066 path = elm_widget_part_text_get(event->obj, NULL);
1091 1067
1092 if (!ecore_file_exists(path)) 1068 if (!ecore_file_exists(path))
1093 { 1069 {
@@ -1161,7 +1137,7 @@ _on_text_activated(void *data,
1161 free(dir); 1137 free(dir);
1162 1138
1163end: 1139end:
1164 elm_object_focus_set(obj, EINA_FALSE); 1140 elm_object_focus_set(event->obj, EINA_FALSE);
1165 1141
1166 return EINA_TRUE; 1142 return EINA_TRUE;
1167} 1143}
@@ -1180,9 +1156,7 @@ _anchors_undo(void *data)
1180} 1156}
1181 1157
1182static Eina_Bool 1158static Eina_Bool
1183_on_text_focused(void *data, 1159_on_text_focused(void *data, const Eo_Event *event EINA_UNUSED)
1184 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
1185 void *event_info EINA_UNUSED)
1186{ 1160{
1187 ELM_FILESELECTOR_DATA_GET(data, sd); 1161 ELM_FILESELECTOR_DATA_GET(data, sd);
1188 1162
@@ -1193,9 +1167,7 @@ _on_text_focused(void *data,
1193} 1167}
1194 1168
1195static Eina_Bool 1169static Eina_Bool
1196_on_text_unfocused(void *data, 1170_on_text_unfocused(void *data, const Eo_Event *event EINA_UNUSED)
1197 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
1198 void *event_info EINA_UNUSED)
1199{ 1171{
1200 ELM_FILESELECTOR_DATA_GET(data, sd); 1172 ELM_FILESELECTOR_DATA_GET(data, sd);
1201 _anchors_do(data, sd->path); 1173 _anchors_do(data, sd->path);
@@ -1204,11 +1176,9 @@ _on_text_unfocused(void *data,
1204} 1176}
1205 1177
1206static Eina_Bool 1178static Eina_Bool
1207_anchor_clicked(void *data, 1179_anchor_clicked(void *data, const Eo_Event *event)
1208 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
1209 void *event_info)
1210{ 1180{
1211 Elm_Entry_Anchor_Info *info = event_info; 1181 Elm_Entry_Anchor_Info *info = event->event_info;
1212 Evas_Object *fs = data; 1182 Evas_Object *fs = data;
1213 const char *p; 1183 const char *p;
1214 1184
@@ -1220,7 +1190,7 @@ _anchor_clicked(void *data,
1220 eina_stringshare_del(p); 1190 eina_stringshare_del(p);
1221 /* After anchor was clicked, entry will be focused, and will be editable. 1191 /* After anchor was clicked, entry will be focused, and will be editable.
1222 * It's wrong. So remove focus. */ 1192 * It's wrong. So remove focus. */
1223 elm_object_focus_set(obj, EINA_FALSE); 1193 elm_object_focus_set(event->obj, EINA_FALSE);
1224 1194
1225 if (sd->path_entry_idler) { 1195 if (sd->path_entry_idler) {
1226 ecore_idler_del(sd->path_entry_idler); 1196 ecore_idler_del(sd->path_entry_idler);
@@ -1231,10 +1201,9 @@ _anchor_clicked(void *data,
1231} 1201}
1232 1202
1233static Eina_Bool 1203static Eina_Bool
1234_files_key_down(void *data, 1204_files_key_down(void *data, const Eo_Event *event)
1235 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
1236{ 1205{
1237 Evas_Event_Key_Down *ev = event_info; 1206 Evas_Event_Key_Down *ev = event->event_info;
1238 Evas_Object *par, *searchbar; 1207 Evas_Object *par, *searchbar;
1239 1208
1240 par = data; 1209 par = data;
@@ -1464,12 +1433,11 @@ _resource_deleted(void *data, int type EINA_UNUSED, void *ev)
1464} 1433}
1465 1434
1466static Eina_Bool 1435static Eina_Bool
1467_preedit_cb(void *data, 1436_preedit_cb(void *data, const Eo_Event *event)
1468 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
1469{ 1437{
1470 ELM_FILESELECTOR_DATA_GET(data, sd); 1438 ELM_FILESELECTOR_DATA_GET(data, sd);
1471 1439
1472 sd->search_string = elm_entry_entry_get(obj); 1440 sd->search_string = elm_entry_entry_get(event->obj);
1473 1441
1474 if (sd->search_string && sd->path) 1442 if (sd->search_string && sd->path)
1475 _populate(data, sd->path, NULL, NULL); 1443 _populate(data, sd->path, NULL, NULL);
diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c
index fb5d08229..eb7e35bdb 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -62,12 +62,10 @@ _elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button
62} 62}
63 63
64static Eina_Bool 64static Eina_Bool
65_selection_done(void *data, 65_selection_done(void *data, const Eo_Event *event)
66 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
67 void *event_info)
68{ 66{
69 Elm_Fileselector_Button_Data *sd = data; 67 Elm_Fileselector_Button_Data *sd = data;
70 const char *file = event_info; 68 const char *file = event->event_info;
71 Evas_Object *del; 69 Evas_Object *del;
72 70
73 if (file) eina_stringshare_replace(&sd->fsd.path, file); 71 if (file) eina_stringshare_replace(&sd->fsd.path, file);
@@ -162,9 +160,7 @@ _activate(Elm_Fileselector_Button_Data *sd)
162} 160}
163 161
164static Eina_Bool 162static Eina_Bool
165_button_clicked(void *data, 163_button_clicked(void *data, const Eo_Event *event EINA_UNUSED)
166 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
167 void *event_info EINA_UNUSED)
168{ 164{
169 _activate(data); 165 _activate(data);
170 166
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index afaa43301..4a2c335e8 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -45,10 +45,9 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
45 45
46#define SIG_FWD(name, event) \ 46#define SIG_FWD(name, event) \
47 static Eina_Bool \ 47 static Eina_Bool \
48 _##name##_fwd(void *data, \ 48 _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \
49 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)\
50 { \ 49 { \
51 eo_do(data, eo_event_callback_call(event, event_info)); \ 50 eo_do(data, eo_event_callback_call(event, ev->event_info)); \
52 \ 51 \
53 return EINA_TRUE; \ 52 return EINA_TRUE; \
54 } 53 }
@@ -66,11 +65,9 @@ SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED)
66#undef SIG_FWD 65#undef SIG_FWD
67 66
68static Eina_Bool 67static Eina_Bool
69_FILE_CHOSEN_fwd(void *data, 68_FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
70 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
71 void *event_info)
72{ 69{
73 const char *file = event_info; 70 const char *file = event->event_info;
74 char *s; 71 char *s;
75 72
76 if (!file) return EINA_TRUE; 73 if (!file) return EINA_TRUE;
@@ -80,15 +77,13 @@ _FILE_CHOSEN_fwd(void *data,
80 elm_object_text_set(sd->entry, s); 77 elm_object_text_set(sd->entry, s);
81 free(s); 78 free(s);
82 eo_do(data, eo_event_callback_call 79 eo_do(data, eo_event_callback_call
83 (ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event_info)); 80 (ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->event_info));
84 81
85 return EINA_TRUE; 82 return EINA_TRUE;
86} 83}
87 84
88static Eina_Bool 85static Eina_Bool
89_ACTIVATED_fwd(void *data, 86_ACTIVATED_fwd(void *data, const Eo_Event *event)
90 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
91 void *event_info)
92{ 87{
93 const char *file; 88 const char *file;
94 89
@@ -97,7 +92,7 @@ _ACTIVATED_fwd(void *data,
97 file = elm_object_text_get(sd->entry); 92 file = elm_object_text_get(sd->entry);
98 elm_fileselector_path_set(sd->button, file); 93 elm_fileselector_path_set(sd->button, file);
99 eo_do(data, eo_event_callback_call 94 eo_do(data, eo_event_callback_call
100 (ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event_info)); 95 (ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->event_info));
101 96
102 return EINA_TRUE; 97 return EINA_TRUE;
103} 98}
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 52e255026..3613e36b4 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -109,13 +109,11 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
109} 109}
110 110
111static Eina_Bool 111static Eina_Bool
112_on_hover_clicked(void *data, 112_on_hover_clicked(void *data, const Eo_Event *event)
113 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
114 void *event_info EINA_UNUSED)
115{ 113{
116 const char *dismissstr; 114 const char *dismissstr;
117 115
118 dismissstr = elm_layout_data_get(obj, "dismiss"); 116 dismissstr = elm_layout_data_get(event->obj, "dismiss");
119 117
120 if (!dismissstr || strcmp(dismissstr, "on")) 118 if (!dismissstr || strcmp(dismissstr, "on"))
121 elm_hoversel_hover_end(data); // for backward compatibility 119 elm_hoversel_hover_end(data); // for backward compatibility
@@ -155,9 +153,7 @@ _auto_update(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
155} 153}
156 154
157static Eina_Bool 155static Eina_Bool
158_on_item_clicked(void *data EINA_UNUSED, 156_on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
159 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
160 void *event_info EINA_UNUSED)
161{ 157{
162 Elm_Hoversel_Item_Data *item = data; 158 Elm_Hoversel_Item_Data *item = data;
163 Evas_Object *obj2 = WIDGET(item); 159 Evas_Object *obj2 = WIDGET(item);
@@ -176,9 +172,7 @@ _on_item_clicked(void *data EINA_UNUSED,
176} 172}
177 173
178static Eina_Bool 174static Eina_Bool
179_item_focused_cb(void *data EINA_UNUSED, 175_item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
180 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
181 void *event_info EINA_UNUSED)
182{ 176{
183 Elm_Hoversel_Item_Data *it = data; 177 Elm_Hoversel_Item_Data *it = data;
184 178
@@ -188,9 +182,7 @@ _item_focused_cb(void *data EINA_UNUSED,
188} 182}
189 183
190static Eina_Bool 184static Eina_Bool
191_item_unfocused_cb(void *data EINA_UNUSED, 185_item_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
192 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
193 void *event_info EINA_UNUSED)
194{ 186{
195 Elm_Hoversel_Item_Data *it = data; 187 Elm_Hoversel_Item_Data *it = data;
196 188
@@ -448,9 +440,7 @@ _activate(Evas_Object *obj)
448} 440}
449 441
450static Eina_Bool 442static Eina_Bool
451_on_clicked(void *data EINA_UNUSED, 443_on_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
452 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
453 void *event_info EINA_UNUSED)
454{ 444{
455 _activate(data); 445 _activate(data);
456 446
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 71aa198df..e62843cf5 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -46,17 +46,13 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
46}; 46};
47 47
48static Eina_Bool 48static Eina_Bool
49_entry_changed_cb(void *data, Eo *obj EINA_UNUSED, 49_entry_changed_cb(void *data, const Eo_Event *event);
50 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
51static Eina_Bool 50static Eina_Bool
52_entry_focus_in_cb(void *data, Eo *obj EINA_UNUSED, 51_entry_focus_in_cb(void *data, const Eo_Event *event);
53 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
54static Eina_Bool 52static Eina_Bool
55_entry_focus_out_cb(void *data, Eo *obj EINA_UNUSED, 53_entry_focus_out_cb(void *data, const Eo_Event *event);
56 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
57static Eina_Bool 54static Eina_Bool
58_entry_clicked_cb(void *data, Eo *obj EINA_UNUSED, 55_entry_clicked_cb(void *data, const Eo_Event *event);
59 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
60 56
61EO_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb, 57EO_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
62 { ELM_MULTIBUTTONENTRY_EVENT_CHANGED, _entry_changed_cb }, 58 { ELM_MULTIBUTTONENTRY_EVENT_CHANGED, _entry_changed_cb },
@@ -1045,8 +1041,7 @@ _entry_resize_cb(void *data,
1045} 1041}
1046 1042
1047static Eina_Bool 1043static Eina_Bool
1048_entry_changed_cb(void *data, 1044_entry_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
1049 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
1050{ 1045{
1051 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); 1046 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE);
1052 const char *str; 1047 const char *str;
@@ -1058,8 +1053,7 @@ _entry_changed_cb(void *data,
1058} 1053}
1059 1054
1060static Eina_Bool 1055static Eina_Bool
1061_entry_focus_in_cb(void *data, 1056_entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED)
1062 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
1063{ 1057{
1064 Elm_Multibuttonentry_Item_Data *item = NULL; 1058 Elm_Multibuttonentry_Item_Data *item = NULL;
1065 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); 1059 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE);
@@ -1075,8 +1069,7 @@ _entry_focus_in_cb(void *data,
1075} 1069}
1076 1070
1077static Eina_Bool 1071static Eina_Bool
1078_entry_focus_out_cb(void *data, 1072_entry_focus_out_cb(void *data, const Eo_Event *event EINA_UNUSED)
1079 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
1080{ 1073{
1081 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); 1074 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE);
1082 const char *str; 1075 const char *str;
@@ -1089,8 +1082,7 @@ _entry_focus_out_cb(void *data,
1089} 1082}
1090 1083
1091static Eina_Bool 1084static Eina_Bool
1092_entry_clicked_cb(void *data, 1085_entry_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
1093 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
1094{ 1086{
1095 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); 1087 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE);
1096 1088
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 9b616e32c..cbf67e2ab 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -39,8 +39,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
39 {NULL, NULL} 39 {NULL, NULL}
40}; 40};
41 41
42static Eina_Bool _on_item_back_btn_clicked(void *data, 42static Eina_Bool _on_item_back_btn_clicked(void *data, const Eo_Event *event);
43 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
44 43
45static Eina_Bool _key_action_top_item_get(Evas_Object *obj, const char *params); 44static Eina_Bool _key_action_top_item_get(Evas_Object *obj, const char *params);
46 45
@@ -953,14 +952,13 @@ _elm_naviframe_elm_layout_sizing_eval(Eo *obj, Elm_Naviframe_Data *sd)
953} 952}
954 953
955static Eina_Bool 954static Eina_Bool
956_on_item_back_btn_clicked(void *data, 955_on_item_back_btn_clicked(void *data, const Eo_Event *event)
957 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
958{ 956{
959 /* Since edje has the event queue, clicked event could be happened 957 /* Since edje has the event queue, clicked event could be happened
960 multiple times on some heavy environment. This callback del will 958 multiple times on some heavy environment. This callback del will
961 prevent those scenario and guarantee only one clicked for it's own 959 prevent those scenario and guarantee only one clicked for it's own
962 page. */ 960 page. */
963 eo_do(obj, eo_event_callback_del( 961 eo_do(event->obj, eo_event_callback_del(
964 EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, 962 EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked,
965 data)); 963 data));
966 elm_naviframe_item_pop(data); 964 elm_naviframe_item_pop(data);
@@ -1419,10 +1417,7 @@ _send_signal(Elm_Naviframe_Item_Data *it, const char *sig)
1419} 1417}
1420 1418
1421static Eina_Bool 1419static Eina_Bool
1422_deferred(void *data, 1420_deferred(void *data, const Eo_Event *event EINA_UNUSED)
1423 Eo *o EINA_UNUSED,
1424 const Eo_Event_Description *desc EINA_UNUSED,
1425 void *event_info EINA_UNUSED)
1426{ 1421{
1427 Elm_Naviframe_Data *nfd = data; 1422 Elm_Naviframe_Data *nfd = data;
1428 Elm_Naviframe_Op *nfo; 1423 Elm_Naviframe_Op *nfo;
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index 3e17b4058..79acdd9c2 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -58,26 +58,19 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
58}; 58};
59 59
60static Eina_Bool 60static Eina_Bool
61_update_frame(void *data, Eo *obj, 61_update_frame(void *data, const Eo_Event *event);
62 const Eo_Event_Description *desc, void *event_info);
63static Eina_Bool 62static Eina_Bool
64_update_slider(void *data, Eo *obj EINA_UNUSED, 63_update_slider(void *data, const Eo_Event *event);
65 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
66static Eina_Bool 64static Eina_Bool
67_play_started(void *data, Eo *obj EINA_UNUSED, 65_play_started(void *data, const Eo_Event *event);
68 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
69static Eina_Bool 66static Eina_Bool
70_play_finished(void *data, Eo *obj EINA_UNUSED, 67_play_finished(void *data, const Eo_Event *event);
71 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
72static Eina_Bool 68static Eina_Bool
73_update_position(void *data, Eo *obj EINA_UNUSED, 69_update_position(void *data, const Eo_Event *event);
74 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
75static Eina_Bool 70static Eina_Bool
76_drag_start(void *data, Eo *obj EINA_UNUSED, 71_drag_start(void *data, const Eo_Event *event);
77 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
78static Eina_Bool 72static Eina_Bool
79_drag_stop(void *data, Eo *obj EINA_UNUSED, 73_drag_stop(void *data, const Eo_Event *event);
80 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
81 74
82static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); 75static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
83static Eina_Bool _key_action_play(Evas_Object *obj, const char *params); 76static Eina_Bool _key_action_play(Evas_Object *obj, const char *params);
@@ -249,8 +242,7 @@ _elm_player_elm_layout_sizing_eval(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
249} 242}
250 243
251static Eina_Bool 244static Eina_Bool
252_update_slider(void *data, 245_update_slider(void *data, const Eo_Event *event EINA_UNUSED)
253 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
254{ 246{
255 double pos, length; 247 double pos, length;
256 Eina_Bool seekable; 248 Eina_Bool seekable;
@@ -273,19 +265,17 @@ _update_slider(void *data,
273} 265}
274 266
275static Eina_Bool 267static Eina_Bool
276_update_frame(void *data, 268_update_frame(void *data, const Eo_Event *event)
277 Eo *obj, const Eo_Event_Description *desc, void *event_info)
278{ 269{
279 ELM_PLAYER_DATA_GET(data, sd); 270 ELM_PLAYER_DATA_GET(data, sd);
280 if (!sd) return EINA_TRUE; 271 if (!sd) return EINA_TRUE;
281 _update_slider(data, obj, desc, event_info); 272 _update_slider(data, event);
282 273
283 return EINA_TRUE; 274 return EINA_TRUE;
284} 275}
285 276
286static Eina_Bool 277static Eina_Bool
287_update_position(void *data, 278_update_position(void *data, const Eo_Event *event EINA_UNUSED)
288 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
289{ 279{
290 double pos; 280 double pos;
291 ELM_PLAYER_DATA_GET(data, sd); 281 ELM_PLAYER_DATA_GET(data, sd);
@@ -298,8 +288,7 @@ _update_position(void *data,
298} 288}
299 289
300static Eina_Bool 290static Eina_Bool
301_drag_start(void *data, 291_drag_start(void *data, const Eo_Event *event EINA_UNUSED)
302 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
303{ 292{
304 ELM_PLAYER_DATA_GET(data, sd); 293 ELM_PLAYER_DATA_GET(data, sd);
305 sd->dragging = EINA_TRUE; 294 sd->dragging = EINA_TRUE;
@@ -308,8 +297,7 @@ _drag_start(void *data,
308} 297}
309 298
310static Eina_Bool 299static Eina_Bool
311_drag_stop(void *data, 300_drag_stop(void *data, const Eo_Event *event EINA_UNUSED)
312 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
313{ 301{
314 ELM_PLAYER_DATA_GET(data, sd); 302 ELM_PLAYER_DATA_GET(data, sd);
315 sd->dragging = EINA_FALSE; 303 sd->dragging = EINA_FALSE;
@@ -318,8 +306,7 @@ _drag_stop(void *data,
318} 306}
319 307
320static Eina_Bool 308static Eina_Bool
321_update_volume(void *data, 309_update_volume(void *data, const Eo_Event *event EINA_UNUSED)
322 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
323{ 310{
324 double vol; 311 double vol;
325 ELM_PLAYER_DATA_GET(data, sd); 312 ELM_PLAYER_DATA_GET(data, sd);
@@ -332,8 +319,7 @@ _update_volume(void *data,
332} 319}
333 320
334static Eina_Bool 321static Eina_Bool
335_forward(void *data, 322_forward(void *data, const Eo_Event *event EINA_UNUSED)
336 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
337{ 323{
338 double pos, length; 324 double pos, length;
339 ELM_PLAYER_DATA_GET(data, sd); 325 ELM_PLAYER_DATA_GET(data, sd);
@@ -351,8 +337,7 @@ _forward(void *data,
351} 337}
352 338
353static Eina_Bool 339static Eina_Bool
354_info(void *data, 340_info(void *data, const Eo_Event *event EINA_UNUSED)
355 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
356{ 341{
357 elm_layout_signal_emit(data, "elm,button,info", "elm"); 342 elm_layout_signal_emit(data, "elm,button,info", "elm");
358 eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_INFO_CLICKED, NULL)); 343 eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_INFO_CLICKED, NULL));
@@ -361,8 +346,7 @@ _info(void *data,
361} 346}
362 347
363static Eina_Bool 348static Eina_Bool
364_next(void *data, 349_next(void *data, const Eo_Event *event EINA_UNUSED)
365 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
366{ 350{
367 elm_layout_signal_emit(data, "elm,button,next", "elm"); 351 elm_layout_signal_emit(data, "elm,button,next", "elm");
368 eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_NEXT_CLICKED, NULL)); 352 eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_NEXT_CLICKED, NULL));
@@ -371,8 +355,7 @@ _next(void *data,
371} 355}
372 356
373static Eina_Bool 357static Eina_Bool
374_pause(void *data, 358_pause(void *data, const Eo_Event *event EINA_UNUSED)
375 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
376{ 359{
377 ELM_PLAYER_DATA_GET(data, sd); 360 ELM_PLAYER_DATA_GET(data, sd);
378 361
@@ -384,8 +367,7 @@ _pause(void *data,
384} 367}
385 368
386static Eina_Bool 369static Eina_Bool
387_play(void *data, 370_play(void *data, const Eo_Event *event EINA_UNUSED)
388 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
389{ 371{
390 ELM_PLAYER_DATA_GET(data, sd); 372 ELM_PLAYER_DATA_GET(data, sd);
391 373
@@ -397,8 +379,7 @@ _play(void *data,
397} 379}
398 380
399static Eina_Bool 381static Eina_Bool
400_prev(void *data, 382_prev(void *data, const Eo_Event *event EINA_UNUSED)
401 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
402{ 383{
403 eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_PREV_CLICKED, NULL)); 384 eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_PREV_CLICKED, NULL));
404 elm_layout_signal_emit(data, "elm,button,prev", "elm"); 385 elm_layout_signal_emit(data, "elm,button,prev", "elm");
@@ -407,8 +388,7 @@ _prev(void *data,
407} 388}
408 389
409static Eina_Bool 390static Eina_Bool
410_rewind(void *data, 391_rewind(void *data, const Eo_Event *event EINA_UNUSED)
411 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
412{ 392{
413 double pos; 393 double pos;
414 ELM_PLAYER_DATA_GET(data, sd); 394 ELM_PLAYER_DATA_GET(data, sd);
@@ -425,8 +405,7 @@ _rewind(void *data,
425} 405}
426 406
427static Eina_Bool 407static Eina_Bool
428_stop(void *data, 408_stop(void *data, const Eo_Event *event EINA_UNUSED)
429 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
430{ 409{
431 elm_layout_signal_emit(data, "elm,button,stop", "elm"); 410 elm_layout_signal_emit(data, "elm,button,stop", "elm");
432 eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL)); 411 eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL));
@@ -435,8 +414,7 @@ _stop(void *data,
435} 414}
436 415
437static Eina_Bool 416static Eina_Bool
438_eject(void *data, 417_eject(void *data, const Eo_Event *event EINA_UNUSED)
439 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
440{ 418{
441 ELM_PLAYER_DATA_GET(data, sd); 419 ELM_PLAYER_DATA_GET(data, sd);
442 420
@@ -465,8 +443,7 @@ _mute_toggle(Evas_Object *obj)
465} 443}
466 444
467static Eina_Bool 445static Eina_Bool
468_volume(void *data, 446_volume(void *data, const Eo_Event *event EINA_UNUSED)
469 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
470{ 447{
471 elm_layout_signal_emit(data, "elm,button,volume", "elm"); 448 elm_layout_signal_emit(data, "elm,button,volume", "elm");
472 _mute_toggle(data); 449 _mute_toggle(data);
@@ -476,8 +453,7 @@ _volume(void *data,
476} 453}
477 454
478static Eina_Bool 455static Eina_Bool
479_mute(void *data, 456_mute(void *data, const Eo_Event *event EINA_UNUSED)
480 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
481{ 457{
482 elm_layout_signal_emit(data, "elm,button,mute", "elm"); 458 elm_layout_signal_emit(data, "elm,button,mute", "elm");
483 _mute_toggle(data); 459 _mute_toggle(data);
@@ -487,8 +463,7 @@ _mute(void *data,
487} 463}
488 464
489static Eina_Bool 465static Eina_Bool
490_play_started(void *data, 466_play_started(void *data, const Eo_Event *event EINA_UNUSED)
491 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
492{ 467{
493 elm_layout_signal_emit(data, "elm,player,play", "elm"); 468 elm_layout_signal_emit(data, "elm,player,play", "elm");
494 469
@@ -496,8 +471,7 @@ _play_started(void *data,
496} 471}
497 472
498static Eina_Bool 473static Eina_Bool
499_play_finished(void *data, 474_play_finished(void *data, const Eo_Event *event EINA_UNUSED)
500 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
501{ 475{
502 elm_layout_signal_emit(data, "elm,player,pause", "elm"); 476 elm_layout_signal_emit(data, "elm,player,pause", "elm");
503 477
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index d9b952a22..25805ff69 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -45,15 +45,12 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
45static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); 45static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
46static void _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); 46static void _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
47static Eina_Bool 47static Eina_Bool
48_block_clicked_cb(void *data, Eo *obj EINA_UNUSED, 48_block_clicked_cb(void *data, const Eo_Event *event);
49 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
50static Eina_Bool 49static Eina_Bool
51_timeout_cb(void *data, Eo *obj EINA_UNUSED, 50_timeout_cb(void *data, const Eo_Event *event);
52 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
53 51
54static Eina_Bool 52static Eina_Bool
55_hide_effect_finished_cb(void *data, Eo *obj EINA_UNUSED, 53_hide_effect_finished_cb(void *data, const Eo_Event *event);
56 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
57 54
58static const Elm_Action key_actions[] = { 55static const Elm_Action key_actions[] = {
59 {"move", _key_action_move}, 56 {"move", _key_action_move},
@@ -100,8 +97,7 @@ _visuals_set(Evas_Object *obj)
100} 97}
101 98
102static Eina_Bool 99static Eina_Bool
103_block_clicked_cb(void *data, 100_block_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
104 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
105{ 101{
106 eo_do(data, eo_event_callback_call(ELM_POPUP_EVENT_BLOCK_CLICKED, NULL)); 102 eo_do(data, eo_event_callback_call(ELM_POPUP_EVENT_BLOCK_CLICKED, NULL));
107 103
@@ -109,8 +105,7 @@ _block_clicked_cb(void *data,
109} 105}
110 106
111static Eina_Bool 107static Eina_Bool
112_timeout_cb(void *data, 108_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
113 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
114{ 109{
115 evas_object_hide(data); 110 evas_object_hide(data);
116 eo_do(data, eo_event_callback_call(ELM_POPUP_EVENT_TIMEOUT, NULL)); 111 eo_do(data, eo_event_callback_call(ELM_POPUP_EVENT_TIMEOUT, NULL));
@@ -119,8 +114,7 @@ _timeout_cb(void *data,
119} 114}
120 115
121static Eina_Bool 116static Eina_Bool
122_hide_effect_finished_cb(void *data, 117_hide_effect_finished_cb(void *data, const Eo_Event *event EINA_UNUSED)
123 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
124{ 118{
125 eo_do(data, eo_event_callback_call(ELM_POPUP_EVENT_DISMISSED, NULL)); 119 eo_do(data, eo_event_callback_call(ELM_POPUP_EVENT_DISMISSED, NULL));
126 120
@@ -874,8 +868,7 @@ _elm_popup_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED, Elm_Popup_Ite
874} 868}
875 869
876static Eina_Bool 870static Eina_Bool
877_item_focused_cb(void *data, 871_item_focused_cb(void *data, const Eo_Event *event EINA_UNUSED)
878 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
879{ 872{
880 Elm_Popup_Item_Data *it = data; 873 Elm_Popup_Item_Data *it = data;
881 874
@@ -885,8 +878,7 @@ _item_focused_cb(void *data,
885} 878}
886 879
887static Eina_Bool 880static Eina_Bool
888_item_unfocused_cb(void *data, 881_item_unfocused_cb(void *data, const Eo_Event *event EINA_UNUSED)
889 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
890{ 882{
891 Elm_Popup_Item_Data *it = data; 883 Elm_Popup_Item_Data *it = data;
892 884
diff --git a/src/lib/elm_app_server.c b/src/lib/elm_app_server.c
index 0225449e8..99aecc1b6 100644
--- a/src/lib/elm_app_server.c
+++ b/src/lib/elm_app_server.c
@@ -29,10 +29,10 @@ typedef struct
29} Elm_App_Server_Data; 29} Elm_App_Server_Data;
30 30
31static Eina_Bool 31static Eina_Bool
32_view_del_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 32_view_del_cb(void *data, const Eo_Event *event)
33{ 33{
34 Elm_App_Server_Data *cdata = data; 34 Elm_App_Server_Data *cdata = data;
35 eina_hash_del(cdata->views, NULL, obj); 35 eina_hash_del(cdata->views, NULL, event->obj);
36 return EINA_TRUE; 36 return EINA_TRUE;
37} 37}
38 38
diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c
index c53a86eed..7a5267de5 100644
--- a/src/lib/elm_atspi_bridge.c
+++ b/src/lib/elm_atspi_bridge.c
@@ -115,17 +115,17 @@ static Eo *_instance;
115static int _init_count = 0; 115static int _init_count = 0;
116 116
117// Object Event handlers 117// Object Event handlers
118static Eina_Bool _state_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info); 118static Eina_Bool _state_changed_signal_send(void *data, const Eo_Event *event);
119static Eina_Bool _property_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info); 119static Eina_Bool _property_changed_signal_send(void *data, const Eo_Event *event);
120static Eina_Bool _children_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info); 120static Eina_Bool _children_changed_signal_send(void *data, const Eo_Event *event);
121static Eina_Bool _window_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info); 121static Eina_Bool _window_signal_send(void *data, const Eo_Event *event);
122static Eina_Bool _visible_data_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info); 122static Eina_Bool _visible_data_changed_signal_send(void *data, const Eo_Event *event);
123static Eina_Bool _active_descendant_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info); 123static Eina_Bool _active_descendant_changed_signal_send(void *data, const Eo_Event *event);
124static Eina_Bool _selection_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info); 124static Eina_Bool _selection_signal_send(void *data, const Eo_Event *event);
125static Eina_Bool _text_text_inserted_send(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info); 125static Eina_Bool _text_text_inserted_send(void *data, const Eo_Event *event);
126static Eina_Bool _text_text_removed_send(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info); 126static Eina_Bool _text_text_removed_send(void *data, const Eo_Event *event);
127static Eina_Bool _text_caret_moved_send(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info); 127static Eina_Bool _text_caret_moved_send(void *data, const Eo_Event *event);
128static Eina_Bool _text_selection_changed_send(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info EINA_UNUSED); 128static Eina_Bool _text_selection_changed_send(void *data, const Eo_Event *event);
129 129
130// bridge private methods 130// bridge private methods
131static void _bridge_object_register(Eo *bridge, Eo *obj); 131static void _bridge_object_register(Eo *bridge, Eo *obj);
@@ -139,8 +139,8 @@ static void _bridge_iter_object_reference_append(Eo *bridge, Eldbus_Message_Iter
139static void _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj); 139static void _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj);
140static Eina_Bool _elm_atspi_bridge_key_filter(void *data, void *loop, int type, void *event); 140static Eina_Bool _elm_atspi_bridge_key_filter(void *data, void *loop, int type, void *event);
141static void _object_desktop_reference_append(Eldbus_Message_Iter *iter); 141static void _object_desktop_reference_append(Eldbus_Message_Iter *iter);
142static Eina_Bool _on_object_add(void *data, Eo *obj, const Eo_Event_Description *event EINA_UNUSED, void *event_info EINA_UNUSED); 142static Eina_Bool _on_object_add(void *data, const Eo_Event *event);
143static Eina_Bool _on_object_del(void *data, Eo *obj, const Eo_Event_Description *event EINA_UNUSED, void *event_info EINA_UNUSED); 143static Eina_Bool _on_object_del(void *data, const Eo_Event *event);
144 144
145typedef struct { 145typedef struct {
146 const Eo_Event_Description *desc; 146 const Eo_Event_Description *desc;
@@ -3802,9 +3802,9 @@ _handle_listener_change(void *data, const Eldbus_Message *msg EINA_UNUSED)
3802} 3802}
3803 3803
3804static Eina_Bool 3804static Eina_Bool
3805_state_changed_signal_send(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 3805_state_changed_signal_send(void *data, const Eo_Event *event)
3806{ 3806{
3807 Elm_Atspi_Event_State_Changed_Data *state_data = event_info; 3807 Elm_Atspi_Event_State_Changed_Data *state_data = event->event_info;
3808 const char *type_desc; 3808 const char *type_desc;
3809 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3809 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE);
3810 3810
@@ -3817,15 +3817,15 @@ _state_changed_signal_send(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descr
3817 3817
3818 type_desc = elm_states_to_atspi_state[state_data->type].name; 3818 type_desc = elm_states_to_atspi_state[state_data->type].name;
3819 3819
3820 _bridge_signal_send(data, obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3820 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3821 &_event_obj_signals[ATSPI_OBJECT_EVENT_STATE_CHANGED], type_desc, state_data->new_value, 0, NULL); 3821 &_event_obj_signals[ATSPI_OBJECT_EVENT_STATE_CHANGED], type_desc, state_data->new_value, 0, NULL);
3822 return EINA_TRUE; 3822 return EINA_TRUE;
3823} 3823}
3824 3824
3825static Eina_Bool 3825static Eina_Bool
3826_property_changed_signal_send(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 3826_property_changed_signal_send(void *data, const Eo_Event *event)
3827{ 3827{
3828 const char *property = event_info; 3828 const char *property = event->event_info;
3829 char *atspi_desc; 3829 char *atspi_desc;
3830 enum _Atspi_Object_Property prop = ATSPI_OBJECT_PROPERTY_LAST; 3830 enum _Atspi_Object_Property prop = ATSPI_OBJECT_PROPERTY_LAST;
3831 3831
@@ -3867,20 +3867,20 @@ _property_changed_signal_send(void *data, Eo *obj EINA_UNUSED, const Eo_Event_De
3867 return EINA_FALSE; 3867 return EINA_FALSE;
3868 } 3868 }
3869 3869
3870 _bridge_signal_send(data, obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3870 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3871 &_event_obj_signals[ATSPI_OBJECT_EVENT_PROPERTY_CHANGED], atspi_desc, 0, 0, NULL, NULL); 3871 &_event_obj_signals[ATSPI_OBJECT_EVENT_PROPERTY_CHANGED], atspi_desc, 0, 0, NULL, NULL);
3872 return EINA_TRUE; 3872 return EINA_TRUE;
3873} 3873}
3874 3874
3875static Eina_Bool 3875static Eina_Bool
3876_visible_data_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 3876_visible_data_changed_signal_send(void *data, const Eo_Event *event)
3877{ 3877{
3878 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3878 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE);
3879 3879
3880 if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED)) 3880 if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED))
3881 return EINA_FALSE; 3881 return EINA_FALSE;
3882 3882
3883 _bridge_signal_send(data, obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3883 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3884 &_event_obj_signals[ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED], "", 3884 &_event_obj_signals[ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED], "",
3885 0, 0, NULL, NULL); 3885 0, 0, NULL, NULL);
3886 3886
@@ -3888,9 +3888,9 @@ _visible_data_changed_signal_send(void *data, Eo *obj, const Eo_Event_Descriptio
3888} 3888}
3889 3889
3890static Eina_Bool 3890static Eina_Bool
3891_active_descendant_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 3891_active_descendant_changed_signal_send(void *data, const Eo_Event *event)
3892{ 3892{
3893 Eo *child = event_info; 3893 Eo *child = event->event_info;
3894 int idx; 3894 int idx;
3895 3895
3896 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3896 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE);
@@ -3900,17 +3900,17 @@ _active_descendant_changed_signal_send(void *data, Eo *obj, const Eo_Event_Descr
3900 3900
3901 eo_do(child, idx = elm_interface_atspi_accessible_index_in_parent_get()); 3901 eo_do(child, idx = elm_interface_atspi_accessible_index_in_parent_get());
3902 3902
3903 _bridge_signal_send(data, obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3903 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3904 &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "", 3904 &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "",
3905 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), child); 3905 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), child);
3906 return EINA_TRUE; 3906 return EINA_TRUE;
3907} 3907}
3908 3908
3909static Eina_Bool 3909static Eina_Bool
3910_children_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 3910_children_changed_signal_send(void *data, const Eo_Event *event)
3911{ 3911{
3912 const char *atspi_desc = NULL; 3912 const char *atspi_desc = NULL;
3913 Elm_Atspi_Event_Children_Changed_Data *ev_data = event_info; 3913 Elm_Atspi_Event_Children_Changed_Data *ev_data = event->event_info;
3914 int idx; 3914 int idx;
3915 enum _Atspi_Object_Child_Event_Type type; 3915 enum _Atspi_Object_Child_Event_Type type;
3916 3916
@@ -3935,7 +3935,7 @@ _children_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *d
3935 3935
3936 if (!atspi_desc) return EINA_FALSE; 3936 if (!atspi_desc) return EINA_FALSE;
3937 3937
3938 _bridge_signal_send(data, obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3938 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3939 &_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc, 3939 &_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc,
3940 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child); 3940 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child);
3941 3941
@@ -3943,25 +3943,25 @@ _children_changed_signal_send(void *data, Eo *obj, const Eo_Event_Description *d
3943} 3943}
3944 3944
3945static Eina_Bool 3945static Eina_Bool
3946_window_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info EINA_UNUSED) 3946_window_signal_send(void *data, const Eo_Event *event)
3947{ 3947{
3948 enum _Atspi_Window_Signals type; 3948 enum _Atspi_Window_Signals type;
3949 3949
3950 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3950 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE);
3951 3951
3952 if (desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_CREATED) 3952 if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_CREATED)
3953 type = ATSPI_WINDOW_EVENT_CREATE; 3953 type = ATSPI_WINDOW_EVENT_CREATE;
3954 else if (desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DESTROYED) 3954 else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DESTROYED)
3955 type = ATSPI_WINDOW_EVENT_DESTROY; 3955 type = ATSPI_WINDOW_EVENT_DESTROY;
3956 else if (desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DEACTIVATED) 3956 else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DEACTIVATED)
3957 type = ATSPI_WINDOW_EVENT_DEACTIVATE; 3957 type = ATSPI_WINDOW_EVENT_DEACTIVATE;
3958 else if (desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_ACTIVATED) 3958 else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_ACTIVATED)
3959 type = ATSPI_WINDOW_EVENT_ACTIVATE; 3959 type = ATSPI_WINDOW_EVENT_ACTIVATE;
3960 else if (desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MAXIMIZED) 3960 else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MAXIMIZED)
3961 type = ATSPI_WINDOW_EVENT_MAXIMIZE; 3961 type = ATSPI_WINDOW_EVENT_MAXIMIZE;
3962 else if (desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MINIMIZED) 3962 else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MINIMIZED)
3963 type = ATSPI_WINDOW_EVENT_MINIMIZE; 3963 type = ATSPI_WINDOW_EVENT_MINIMIZE;
3964 else if (desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED) 3964 else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED)
3965 type = ATSPI_WINDOW_EVENT_RESTORE; 3965 type = ATSPI_WINDOW_EVENT_RESTORE;
3966 else 3966 else
3967 return EINA_FALSE; 3967 return EINA_FALSE;
@@ -3975,20 +3975,20 @@ _window_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc, void
3975 return EINA_FALSE; 3975 return EINA_FALSE;
3976 } 3976 }
3977 3977
3978 _bridge_signal_send(data, obj, ATSPI_DBUS_INTERFACE_EVENT_WINDOW, 3978 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_WINDOW,
3979 &_window_obj_signals[type], "", 0, 0, "i", 0); 3979 &_window_obj_signals[type], "", 0, 0, "i", 0);
3980 return EINA_TRUE; 3980 return EINA_TRUE;
3981} 3981}
3982 3982
3983static Eina_Bool 3983static Eina_Bool
3984_selection_signal_send(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 3984_selection_signal_send(void *data, const Eo_Event *event)
3985{ 3985{
3986 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 3986 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
3987 3987
3988 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_SELECTION_CHANGED)) 3988 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_SELECTION_CHANGED))
3989 return EINA_FALSE; 3989 return EINA_FALSE;
3990 3990
3991 _bridge_signal_send(data, obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3991 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3992 &_event_obj_signals[ATSPI_OBJECT_EVENT_SELECTION_CHANGED], "", 0, 0, "i", 0); 3992 &_event_obj_signals[ATSPI_OBJECT_EVENT_SELECTION_CHANGED], "", 0, 0, "i", 0);
3993 return EINA_TRUE; 3993 return EINA_TRUE;
3994} 3994}
@@ -4077,7 +4077,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld
4077} 4077}
4078 4078
4079static Eina_Bool 4079static Eina_Bool
4080_text_caret_moved_send(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 4080_text_caret_moved_send(void *data, const Eo_Event *event)
4081{ 4081{
4082 int cursor_pos = 0; 4082 int cursor_pos = 0;
4083 4083
@@ -4086,55 +4086,55 @@ _text_caret_moved_send(void *data, Eo *obj, const Eo_Event_Description *desc EIN
4086 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED)) 4086 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED))
4087 return EINA_TRUE; 4087 return EINA_TRUE;
4088 4088
4089 eo_do(obj, cursor_pos = elm_interface_atspi_text_caret_offset_get()); 4089 eo_do(event->obj, cursor_pos = elm_interface_atspi_text_caret_offset_get());
4090 4090
4091 _bridge_signal_send(data, obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4091 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4092 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED], "", cursor_pos, 0, NULL, NULL); 4092 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED], "", cursor_pos, 0, NULL, NULL);
4093 4093
4094 return EINA_TRUE; 4094 return EINA_TRUE;
4095} 4095}
4096 4096
4097static Eina_Bool 4097static Eina_Bool
4098_text_text_inserted_send(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 4098_text_text_inserted_send(void *data, const Eo_Event *event)
4099{ 4099{
4100 Elm_Atspi_Text_Change_Info *info = event_info; 4100 Elm_Atspi_Text_Change_Info *info = event->event_info;
4101 4101
4102 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4102 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
4103 4103
4104 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED)) 4104 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED))
4105 return EINA_TRUE; 4105 return EINA_TRUE;
4106 4106
4107 _bridge_signal_send(data, obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4107 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4108 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "insert", info->pos, info->len, "s", info->content); 4108 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "insert", info->pos, info->len, "s", info->content);
4109 4109
4110 return EINA_TRUE; 4110 return EINA_TRUE;
4111} 4111}
4112 4112
4113static Eina_Bool 4113static Eina_Bool
4114_text_text_removed_send(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 4114_text_text_removed_send(void *data, const Eo_Event *event)
4115{ 4115{
4116 Elm_Atspi_Text_Change_Info *info = event_info; 4116 Elm_Atspi_Text_Change_Info *info = event->event_info;
4117 4117
4118 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4118 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
4119 4119
4120 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED)) 4120 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED))
4121 return EINA_TRUE; 4121 return EINA_TRUE;
4122 4122
4123 _bridge_signal_send(data, obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4123 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4124 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "delete", info->pos, info->len, "s", info->content); 4124 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "delete", info->pos, info->len, "s", info->content);
4125 4125
4126 return EINA_TRUE; 4126 return EINA_TRUE;
4127} 4127}
4128 4128
4129static Eina_Bool 4129static Eina_Bool
4130_text_selection_changed_send(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 4130_text_selection_changed_send(void *data, const Eo_Event *event)
4131{ 4131{
4132 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4132 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
4133 4133
4134 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED)) 4134 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED))
4135 return EINA_TRUE; 4135 return EINA_TRUE;
4136 4136
4137 _bridge_signal_send(data, obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4137 _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4138 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED], "", 0, 0, NULL, NULL); 4138 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED], "", 0, 0, NULL, NULL);
4139 4139
4140 return EINA_TRUE; 4140 return EINA_TRUE;
@@ -4163,7 +4163,7 @@ _bridge_object_unregister(Eo *bridge, Eo *obj)
4163} 4163}
4164 4164
4165static Eina_Bool 4165static Eina_Bool
4166_on_object_add(void *data, Eo *obj, const Eo_Event_Description *event EINA_UNUSED, void *event_info EINA_UNUSED) 4166_on_object_add(void *data, const Eo_Event *event)
4167{ 4167{
4168 Eldbus_Message *sig; 4168 Eldbus_Message *sig;
4169 Eldbus_Message_Iter *iter; 4169 Eldbus_Message_Iter *iter;
@@ -4172,7 +4172,7 @@ _on_object_add(void *data, Eo *obj, const Eo_Event_Description *event EINA_UNUSE
4172 4172
4173 sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_ADDED); 4173 sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_ADDED);
4174 iter = eldbus_message_iter_get(sig); 4174 iter = eldbus_message_iter_get(sig);
4175 _cache_item_reference_append_cb(data, obj, iter); 4175 _cache_item_reference_append_cb(data, event->obj, iter);
4176 4176
4177 eldbus_service_signal_send(pd->cache_interface, sig); 4177 eldbus_service_signal_send(pd->cache_interface, sig);
4178 4178
@@ -4180,17 +4180,17 @@ _on_object_add(void *data, Eo *obj, const Eo_Event_Description *event EINA_UNUSE
4180} 4180}
4181 4181
4182static Eina_Bool 4182static Eina_Bool
4183_on_object_del(void *data, Eo *obj, const Eo_Event_Description *event EINA_UNUSED, void *event_info EINA_UNUSED) 4183_on_object_del(void *data, const Eo_Event *event)
4184{ 4184{
4185 Eldbus_Message *sig; 4185 Eldbus_Message *sig;
4186 4186
4187 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4187 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
4188 4188
4189 _bridge_object_unregister(data, obj); 4189 _bridge_object_unregister(data, event->obj);
4190 4190
4191 sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_REMOVED); 4191 sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_REMOVED);
4192 Eldbus_Message_Iter *iter = eldbus_message_iter_get(sig); 4192 Eldbus_Message_Iter *iter = eldbus_message_iter_get(sig);
4193 _bridge_iter_object_reference_append(data, iter, obj); 4193 _bridge_iter_object_reference_append(data, iter, event->obj);
4194 eldbus_service_signal_send(pd->cache_interface, sig); 4194 eldbus_service_signal_send(pd->cache_interface, sig);
4195 4195
4196 return EINA_TRUE; 4196 return EINA_TRUE;
@@ -4318,14 +4318,14 @@ _interfaces_register(Eo *bridge)
4318} 4318}
4319 4319
4320static Eina_Bool 4320static Eina_Bool
4321_bridge_accessible_event_dispatch(void *data, Eo *accessible, const Eo_Event_Description *desc, void *event_info) 4321_bridge_accessible_event_dispatch(void *data, const Eo_Event *event)
4322{ 4322{
4323 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4323 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
4324 4324
4325 _bridge_object_register(data, accessible); 4325 _bridge_object_register(data, event->obj);
4326 4326
4327 Eo_Event_Cb cb = eina_hash_find(pd->event_hash, &desc); 4327 Eo_Event_Cb cb = eina_hash_find(pd->event_hash, &event->desc);
4328 return cb ? cb(data, accessible, desc, event_info) : EINA_TRUE; 4328 return cb ? cb(data, event) : EINA_TRUE;
4329} 4329}
4330 4330
4331static void 4331static void
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index 1231f29d5..5bfe9998b 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -29,22 +29,20 @@ _elm_box_list_data_get(const Eina_List *list)
29} 29}
30 30
31static Eina_Bool 31static Eina_Bool
32_child_added_cb_proxy(void *data, 32_child_added_cb_proxy(void *data, const Eo_Event *event)
33 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
34{ 33{
35 Evas_Object *box = data; 34 Evas_Object *box = data;
36 Evas_Object_Box_Option *opt = event_info; 35 Evas_Object_Box_Option *opt = event->event_info;
37 eo_do(box, eo_event_callback_call(ELM_BOX_EVENT_CHILD_ADDED, opt->obj)); 36 eo_do(box, eo_event_callback_call(ELM_BOX_EVENT_CHILD_ADDED, opt->obj));
38 37
39 return EINA_TRUE; 38 return EINA_TRUE;
40} 39}
41 40
42static Eina_Bool 41static Eina_Bool
43_child_removed_cb_proxy(void *data, 42_child_removed_cb_proxy(void *data, const Eo_Event *event)
44 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
45{ 43{
46 Evas_Object *box = data; 44 Evas_Object *box = data;
47 Evas_Object *child = event_info; 45 Evas_Object *child = event->event_info;
48 eo_do(box, eo_event_callback_call(ELM_BOX_EVENT_CHILD_REMOVED, child)); 46 eo_do(box, eo_event_callback_call(ELM_BOX_EVENT_CHILD_REMOVED, child));
49 47
50 return EINA_TRUE; 48 return EINA_TRUE;
@@ -195,11 +193,10 @@ _transition_animation(void *data)
195} 193}
196 194
197static Eina_Bool 195static Eina_Bool
198_transition_layout_child_added(void *data, 196_transition_layout_child_added(void *data, const Eo_Event *event)
199 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
200{ 197{
201 Transition_Animation_Data *tad; 198 Transition_Animation_Data *tad;
202 Evas_Object_Box_Option *opt = event_info; 199 Evas_Object_Box_Option *opt = event->event_info;
203 Elm_Box_Transition *layout_data = data; 200 Elm_Box_Transition *layout_data = data;
204 201
205 tad = calloc(1, sizeof(Transition_Animation_Data)); 202 tad = calloc(1, sizeof(Transition_Animation_Data));
@@ -213,8 +210,7 @@ _transition_layout_child_added(void *data,
213} 210}
214 211
215static Eina_Bool 212static Eina_Bool
216_transition_layout_child_removed(void *data, 213_transition_layout_child_removed(void *data, const Eo_Event *event)
217 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
218{ 214{
219 Eina_List *l; 215 Eina_List *l;
220 Transition_Animation_Data *tad; 216 Transition_Animation_Data *tad;
@@ -222,7 +218,7 @@ _transition_layout_child_removed(void *data,
222 218
223 EINA_LIST_FOREACH(layout_data->objs, l, tad) 219 EINA_LIST_FOREACH(layout_data->objs, l, tad)
224 { 220 {
225 if (tad->obj == event_info) 221 if (tad->obj == event->event_info)
226 { 222 {
227 free(eina_list_data_get(l)); 223 free(eina_list_data_get(l));
228 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/elm_cnp.c b/src/lib/elm_cnp.c
index b06b14894..0bb7ff5bd 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -1706,12 +1706,10 @@ _x11_dnd_status(void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev)
1706} 1706}
1707 1707
1708static Eina_Bool 1708static Eina_Bool
1709_x11_win_rotation_changed_cb(void *data, 1709_x11_win_rotation_changed_cb(void *data, const Eo_Event *event)
1710 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
1711 void *event_info EINA_UNUSED)
1712{ 1710{
1713 Evas_Object *win = data; 1711 Evas_Object *win = data;
1714 int rot = elm_win_rotation_get(obj); 1712 int rot = elm_win_rotation_get(event->obj);
1715 elm_win_rotation_set(win, rot); 1713 elm_win_rotation_set(win, rot);
1716 return EINA_TRUE; 1714 return EINA_TRUE;
1717} 1715}
diff --git a/src/lib/elm_color_class.c b/src/lib/elm_color_class.c
index 6d36ec87b..fd9bb0e06 100644
--- a/src/lib/elm_color_class.c
+++ b/src/lib/elm_color_class.c
@@ -128,9 +128,7 @@ _colorclass_select(void *data, Evas_Object *obj EINA_UNUSED, const char *sig, co
128} 128}
129 129
130static Eina_Bool 130static Eina_Bool
131_colorclass_changed(void *data, Evas_Object *obj EINA_UNUSED, 131_colorclass_changed(void *data, const Eo_Event *event EINA_UNUSED)
132 const Eo_Event_Description *desc EINA_UNUSED,
133 void *event_info EINA_UNUSED)
134{ 132{
135 Colorclass_UI *cc = data; 133 Colorclass_UI *cc = data;
136 134
@@ -154,9 +152,7 @@ _colorclass_changed(void *data, Evas_Object *obj EINA_UNUSED,
154} 152}
155 153
156static Eina_Bool 154static Eina_Bool
157_colorclass_reset(void *data, Evas_Object *obj EINA_UNUSED, 155_colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED)
158 const Eo_Event_Description *desc EINA_UNUSED,
159 void *event_info EINA_UNUSED)
160{ 156{
161 Colorclass_UI *cc = data; 157 Colorclass_UI *cc = data;
162 Colorclass color; 158 Colorclass color;
@@ -194,12 +190,10 @@ _colorclass_reset(void *data, Evas_Object *obj EINA_UNUSED,
194} 190}
195 191
196static Eina_Bool 192static Eina_Bool
197_colorclass_activate(void *data, Eo *obj EINA_UNUSED, 193_colorclass_activate(void *data, const Eo_Event *event)
198 const Eo_Event_Description *desc EINA_UNUSED,
199 void *event_info)
200{ 194{
201 Colorclass_UI *cc = data; 195 Colorclass_UI *cc = data;
202 Elm_Object_Item *it = event_info; 196 Elm_Object_Item *it = event->event_info;
203 Edje_Color_Class *ecc; 197 Edje_Color_Class *ecc;
204 Colorclass *lcc; 198 Colorclass *lcc;
205 Eina_List *l; 199 Eina_List *l;
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index a4d2b0d96..bc3c2b481 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -635,19 +635,17 @@ _colors_set(Evas_Object *obj,
635} 635}
636 636
637static Eina_Bool 637static Eina_Bool
638_spinner_changed_cb(void *data, Eo *obj, 638_spinner_changed_cb(void *data, const Eo_Event *event)
639 const Eo_Event_Description *desc EINA_UNUSED,
640 void *event_info EINA_UNUSED)
641{ 639{
642 Elm_Colorselector_Data *sd = data; 640 Elm_Colorselector_Data *sd = data;
643 Evas_Object *parent; 641 Evas_Object *parent;
644 int i, v; 642 int i, v;
645 643
646 for (i = 0; i < 4 && sd->spinners[i] != obj; i++); 644 for (i = 0; i < 4 && sd->spinners[i] != event->obj; i++);
647 645
648 parent = evas_object_data_get(obj, "parent"); 646 parent = evas_object_data_get(event->obj, "parent");
649 v = elm_spinner_value_get(obj); 647 v = elm_spinner_value_get(event->obj);
650 evas_object_data_set(obj, "_changed", obj); 648 evas_object_data_set(event->obj, "_changed", event->obj);
651 649
652 switch (i) 650 switch (i)
653 { 651 {
@@ -664,7 +662,7 @@ _spinner_changed_cb(void *data, Eo *obj,
664 _colors_set(parent, sd->r, sd->g, sd->b, v); 662 _colors_set(parent, sd->r, sd->g, sd->b, v);
665 break; 663 break;
666 } 664 }
667 evas_object_data_del(obj, "_changed"); 665 evas_object_data_del(event->obj, "_changed");
668 eo_do(parent, eo_event_callback_call(ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL)); 666 eo_do(parent, eo_event_callback_call(ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL));
669 667
670 return EINA_TRUE; 668 return EINA_TRUE;
@@ -697,15 +695,13 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj)
697} 695}
698 696
699static Eina_Bool 697static Eina_Bool
700_start_grab_pick_cb(void *data, Eo *obj, 698_start_grab_pick_cb(void *data, const Eo_Event *event)
701 const Eo_Event_Description *desc EINA_UNUSED,
702 void *event_info EINA_UNUSED)
703{ 699{
704 Evas_Object *o = data; 700 Evas_Object *o = data;
705 701
706 ELM_COLORSELECTOR_DATA_GET(o, sd); 702 ELM_COLORSELECTOR_DATA_GET(o, sd);
707 703
708 elm_object_disabled_set(obj, EINA_TRUE); 704 elm_object_disabled_set(event->obj, EINA_TRUE);
709 705
710 sd->grab.mouse_motion = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _mouse_grab_pixels, o); 706 sd->grab.mouse_motion = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _mouse_grab_pixels, o);
711 sd->grab.key_up = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _key_up_cb, o); 707 sd->grab.key_up = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _key_up_cb, o);
@@ -1016,15 +1012,13 @@ _colorbar_move_cb(void *data,
1016} 1012}
1017 1013
1018static Eina_Bool 1014static Eina_Bool
1019_button_clicked_cb(void *data, Eo *obj, 1015_button_clicked_cb(void *data, const Eo_Event *event)
1020 const Eo_Event_Description *desc EINA_UNUSED,
1021 void *event_info EINA_UNUSED)
1022{ 1016{
1023 Color_Bar_Data *cb_data = data; 1017 Color_Bar_Data *cb_data = data;
1024 double x, y, step; 1018 double x, y, step;
1025 ELM_COLORSELECTOR_DATA_GET(cb_data->parent, sd); 1019 ELM_COLORSELECTOR_DATA_GET(cb_data->parent, sd);
1026 1020
1027 if (obj == cb_data->rbt) step = 1.0; 1021 if (event->obj == cb_data->rbt) step = 1.0;
1028 else step = -1.0; 1022 else step = -1.0;
1029 1023
1030 edje_object_part_drag_value_get(cb_data->colorbar, "elm.arrow", &x, &y); 1024 edje_object_part_drag_value_get(cb_data->colorbar, "elm.arrow", &x, &y);
@@ -1063,14 +1057,12 @@ _button_clicked_cb(void *data, Eo *obj,
1063} 1057}
1064 1058
1065static Eina_Bool 1059static Eina_Bool
1066_button_repeat_cb(void *data, Eo *obj, 1060_button_repeat_cb(void *data, const Eo_Event *event EINA_UNUSED)
1067 const Eo_Event_Description *desc EINA_UNUSED,
1068 void *event_info EINA_UNUSED)
1069{ 1061{
1070 Color_Bar_Data *cb_data = data; 1062 Color_Bar_Data *cb_data = data;
1071 double x, y, step; 1063 double x, y, step;
1072 1064
1073 if (obj == cb_data->rbt) step = 1.0 / BASE_STEP; 1065 if (event->obj == cb_data->rbt) step = 1.0 / BASE_STEP;
1074 else step = -1.0 / BASE_STEP; 1066 else step = -1.0 / BASE_STEP;
1075 1067
1076 edje_object_part_drag_value_get(cb_data->colorbar, "elm.arrow", &x, &y); 1068 edje_object_part_drag_value_get(cb_data->colorbar, "elm.arrow", &x, &y);
@@ -2009,19 +2001,29 @@ _key_action_move(Evas_Object *obj, const char *params)
2009 if (!strcmp(dir, "left")) 2001 if (!strcmp(dir, "left"))
2010 { 2002 {
2011 if (sd->focused == ELM_COLORSELECTOR_PALETTE && sd->selected) 2003 if (sd->focused == ELM_COLORSELECTOR_PALETTE && sd->selected)
2012 cl = eina_list_prev(sd->selected); 2004 {
2005 cl = eina_list_prev(sd->selected);
2006 }
2013 else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS) 2007 else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS)
2014 _button_clicked_cb(sd->cb_data[sd->sel_color_type], 2008 {
2015 sd->cb_data[sd->sel_color_type]->lbt, NULL, NULL); 2009 Eo_Event event = {0};
2010 event.obj = sd->cb_data[sd->sel_color_type]->lbt;
2011 _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event);
2012 }
2016 else return EINA_FALSE; 2013 else return EINA_FALSE;
2017 } 2014 }
2018 else if (!strcmp(dir, "right")) 2015 else if (!strcmp(dir, "right"))
2019 { 2016 {
2020 if (sd->focused == ELM_COLORSELECTOR_PALETTE && sd->selected) 2017 if (sd->focused == ELM_COLORSELECTOR_PALETTE && sd->selected)
2021 cl = eina_list_next(sd->selected); 2018 {
2019 cl = eina_list_next(sd->selected);
2020 }
2022 else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS) 2021 else if (sd->focused == ELM_COLORSELECTOR_COMPONENTS)
2023 _button_clicked_cb(sd->cb_data[sd->sel_color_type], 2022 {
2024 sd->cb_data[sd->sel_color_type]->rbt, NULL, NULL); 2023 Eo_Event event = {0};
2024 event.obj = sd->cb_data[sd->sel_color_type]->rbt;
2025 _button_clicked_cb(sd->cb_data[sd->sel_color_type], &event);
2026 }
2025 else return EINA_FALSE; 2027 else return EINA_FALSE;
2026 } 2028 }
2027 else if (!strcmp(dir, "up")) 2029 else if (!strcmp(dir, "up"))
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 8b5678740..4f4c37308 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -349,10 +349,7 @@ _land_indicator_connect_cb(void *data)
349} 349}
350 350
351static Eina_Bool 351static Eina_Bool
352_land_indicator_disconnected(void *data, 352_land_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED)
353 Eo *obj EINA_UNUSED,
354 const Eo_Event_Description *desc EINA_UNUSED,
355 void *event_info EINA_UNUSED)
356{ 353{
357 Evas_Object *conform = data; 354 Evas_Object *conform = data;
358 355
@@ -364,10 +361,7 @@ _land_indicator_disconnected(void *data,
364} 361}
365 362
366static Eina_Bool 363static Eina_Bool
367_port_indicator_disconnected(void *data, 364_port_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED)
368 Eo *obj EINA_UNUSED,
369 const Eo_Event_Description *desc EINA_UNUSED,
370 void *event_info EINA_UNUSED)
371{ 365{
372 Evas_Object *conform = data; 366 Evas_Object *conform = data;
373 367
@@ -513,12 +507,10 @@ _indicator_opacity_set(Evas_Object *conformant, Elm_Win_Indicator_Opacity_Mode i
513} 507}
514 508
515static Eina_Bool 509static Eina_Bool
516_on_indicator_mode_changed(void *data, 510_on_indicator_mode_changed(void *data, const Eo_Event *event)
517 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
518 void *event_info EINA_UNUSED)
519{ 511{
520 Evas_Object *conformant = data; 512 Evas_Object *conformant = data;
521 Evas_Object *win = obj; 513 Evas_Object *win = event->obj;
522 514
523 Elm_Win_Indicator_Mode indmode; 515 Elm_Win_Indicator_Mode indmode;
524 Elm_Win_Indicator_Opacity_Mode ind_o_mode; 516 Elm_Win_Indicator_Opacity_Mode ind_o_mode;
@@ -535,12 +527,10 @@ _on_indicator_mode_changed(void *data,
535} 527}
536 528
537static Eina_Bool 529static Eina_Bool
538_on_rotation_changed(void *data, 530_on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED)
539 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
540 void *event_info EINA_UNUSED)
541{ 531{
542 int rot = 0; 532 int rot = 0;
543 Evas_Object *win = obj; 533 Evas_Object *win = event->obj;
544 Evas_Object *conformant = data; 534 Evas_Object *conformant = data;
545 Evas_Object *old_indi = NULL; 535 Evas_Object *old_indi = NULL;
546 536
@@ -1012,9 +1002,11 @@ _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
1012 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 1002 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
1013 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER)); 1003 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
1014 1004
1005 Eo_Event event = {0};
1006 event.obj = sd->win;
1015 sd->win = elm_widget_top_get(obj); 1007 sd->win = elm_widget_top_get(obj);
1016 _on_indicator_mode_changed(obj, sd->win, NULL, NULL); 1008 _on_indicator_mode_changed(obj, &event);
1017 _on_rotation_changed(obj, sd->win, NULL, NULL); 1009 _on_rotation_changed(obj, &event);
1018 1010
1019 sd->indmode = elm_win_indicator_mode_get(sd->win); 1011 sd->indmode = elm_win_indicator_mode_get(sd->win);
1020 sd->ind_o_mode = elm_win_indicator_opacity_get(sd->win); 1012 sd->ind_o_mode = elm_win_indicator_opacity_get(sd->win);
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index 0f76ab9eb..4b245efe4 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -192,8 +192,7 @@ _item_signal_emit_cb(void *data,
192} 192}
193 193
194static Eina_Bool 194static Eina_Bool
195_item_clicked_cb(void *data, 195_item_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
196 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
197{ 196{
198 Elm_Dayselector_Item_Data *it = data; 197 Elm_Dayselector_Item_Data *it = data;
199 198
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index e22fe464d..95b313693 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1313,9 +1313,7 @@ _hover_del_job(void *data)
1313} 1313}
1314 1314
1315static Eina_Bool 1315static Eina_Bool
1316_hover_dismissed_cb(void *data, 1316_hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED)
1317 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
1318 void *event_info EINA_UNUSED)
1319{ 1317{
1320 ELM_ENTRY_DATA_GET(data, sd); 1318 ELM_ENTRY_DATA_GET(data, sd);
1321 1319
@@ -2411,8 +2409,7 @@ _anchor_hover_del_cb(void *data,
2411} 2409}
2412 2410
2413static Eina_Bool 2411static Eina_Bool
2414_anchor_hover_clicked_cb(void *data, 2412_anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
2415 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
2416{ 2413{
2417 elm_entry_anchor_hover_end(data); 2414 elm_entry_anchor_hover_end(data);
2418 2415
@@ -3880,28 +3877,22 @@ elm_entry_add(Evas_Object *parent)
3880} 3877}
3881 3878
3882static Eina_Bool 3879static Eina_Bool
3883_cb_added(void *data EINA_UNUSED, 3880_cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
3884 Eo *obj,
3885 const Eo_Event_Description *desc EINA_UNUSED,
3886 void *event_info)
3887{ 3881{
3888 const Eo_Callback_Array_Item *event = event_info; 3882 const Eo_Callback_Array_Item *event = ev->event_info;
3889 3883
3890 ELM_ENTRY_DATA_GET(obj, sd); 3884 ELM_ENTRY_DATA_GET(ev->obj, sd);
3891 if (event->desc == ELM_ENTRY_EVENT_VALIDATE) 3885 if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
3892 sd->validators++; 3886 sd->validators++;
3893 return EO_CALLBACK_CONTINUE; 3887 return EO_CALLBACK_CONTINUE;
3894} 3888}
3895 3889
3896static Eina_Bool 3890static Eina_Bool
3897_cb_deleted(void *data EINA_UNUSED, 3891_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
3898 Eo *obj,
3899 const Eo_Event_Description *desc EINA_UNUSED,
3900 void *event_info)
3901{ 3892{
3902 const Eo_Callback_Array_Item *event = event_info; 3893 const Eo_Callback_Array_Item *event = ev->event_info;
3903 3894
3904 ELM_ENTRY_DATA_GET(obj, sd); 3895 ELM_ENTRY_DATA_GET(ev->obj, sd);
3905 if (event->desc == ELM_ENTRY_EVENT_VALIDATE) 3896 if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
3906 sd->validators--; 3897 sd->validators--;
3907 return EO_CALLBACK_CONTINUE; 3898 return EO_CALLBACK_CONTINUE;
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index 7cc41124c..f08ad6e18 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -97,8 +97,7 @@ _elm_frame_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd E
97} 97}
98 98
99static Eina_Bool 99static Eina_Bool
100_recalc(void *data, 100_recalc(void *data, const Eo_Event *event EINA_UNUSED)
101 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
102{ 101{
103 elm_layout_sizing_eval(data); 102 elm_layout_sizing_eval(data);
104 103
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index bdcbce9a6..a3c419a40 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -2015,10 +2015,7 @@ _item_realize(Elm_Gen_Item *it,
2015} 2015}
2016 2016
2017static Eina_Bool 2017static Eina_Bool
2018_tree_effect_animator_cb(void *data, 2018_tree_effect_animator_cb(void *data, const Eo_Event *event EINA_UNUSED)
2019 Eo *obj EINA_UNUSED,
2020 const Eo_Event_Description *desc EINA_UNUSED,
2021 void *event_info EINA_UNUSED)
2022{ 2019{
2023 int in = 0; 2020 int in = 0;
2024 const Eina_List *l; 2021 const Eina_List *l;
diff --git a/src/lib/elm_helper.c b/src/lib/elm_helper.c
index a1aae3f4c..4f5710af4 100644
--- a/src/lib/elm_helper.c
+++ b/src/lib/elm_helper.c
@@ -39,12 +39,9 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator)
39} 39}
40 40
41EAPI Eina_Bool 41EAPI Eina_Bool
42elm_validator_regexp_helper(void *data, 42elm_validator_regexp_helper(void *data, const Eo_Event *event)
43 Eo *obj EINA_UNUSED,
44 const Eo_Event_Description *desc EINA_UNUSED,
45 void *event_info)
46{ 43{
47 Elm_Validate_Content *vc = event_info; 44 Elm_Validate_Content *vc = event->event_info;
48 Elm_Validator_Regexp *validator = (Elm_Validator_Regexp *)data; 45 Elm_Validator_Regexp *validator = (Elm_Validator_Regexp *)data;
49 46
50 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/elm_helper.h b/src/lib/elm_helper.h
index ec9250051..9d0d60bfa 100644
--- a/src/lib/elm_helper.h
+++ b/src/lib/elm_helper.h
@@ -102,7 +102,7 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNUL
102 * @since 1.14 102 * @since 1.14
103 */ 103 */
104EAPI Eina_Bool 104EAPI Eina_Bool
105elm_validator_regexp_helper(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info); 105elm_validator_regexp_helper(void *data, const Eo_Event *event);
106#endif 106#endif
107 107
108/** 108/**
diff --git a/src/lib/elm_interface_atspi_accessible.c b/src/lib/elm_interface_atspi_accessible.c
index 19a020f0d..19b198533 100644
--- a/src/lib/elm_interface_atspi_accessible.c
+++ b/src/lib/elm_interface_atspi_accessible.c
@@ -343,10 +343,14 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
343 return; 343 return;
344 } 344 }
345 345
346 Eo_Event ev;
347 ev.obj = accessible;
348 ev.desc = event;
349 ev.event_info = event_info;
346 EINA_LIST_FOREACH(global_callbacks, l, hdl) 350 EINA_LIST_FOREACH(global_callbacks, l, hdl)
347 { 351 {
348 if (hdl->cb) 352 if (hdl->cb)
349 hdl->cb(hdl->data, accessible, event, event_info); 353 hdl->cb(hdl->data, &ev);
350 } 354 }
351} 355}
352 356
@@ -411,7 +415,7 @@ elm_atspi_relation_clone(const Elm_Atspi_Relation *relation)
411} 415}
412 416
413static Eina_Bool 417static Eina_Bool
414_on_rel_obj_del(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 418_on_rel_obj_del(void *data, const Eo_Event *event)
415{ 419{
416 Elm_Atspi_Relation_Set *set = data; 420 Elm_Atspi_Relation_Set *set = data;
417 Elm_Atspi_Relation *rel; 421 Elm_Atspi_Relation *rel;
@@ -422,7 +426,7 @@ _on_rel_obj_del(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSE
422 { 426 {
423 EINA_LIST_FOREACH_SAFE(rel->objects, p, p2, rel_obj) 427 EINA_LIST_FOREACH_SAFE(rel->objects, p, p2, rel_obj)
424 { 428 {
425 if (rel_obj == obj) 429 if (rel_obj == event->obj)
426 rel->objects = eina_list_remove_list(rel->objects, p); 430 rel->objects = eina_list_remove_list(rel->objects, p);
427 } 431 }
428 if (!rel->objects) 432 if (!rel->objects)
diff --git a/src/lib/elm_interface_atspi_image.c b/src/lib/elm_interface_atspi_image.c
index 7e8eeefc8..70492d0ba 100644
--- a/src/lib/elm_interface_atspi_image.c
+++ b/src/lib/elm_interface_atspi_image.c
@@ -9,7 +9,7 @@
9#include "elm_priv.h" 9#include "elm_priv.h"
10 10
11static Eina_Bool 11static Eina_Bool
12_free_desc_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 12_free_desc_cb(void *data, const Eo_Event *event EINA_UNUSED)
13{ 13{
14 eina_stringshare_del(data); 14 eina_stringshare_del(data);
15 15
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index dfcaf6d3e..1a1aca96f 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -61,13 +61,13 @@ _elm_scroll_wanted_coordinates_update(Elm_Scrollable_Smart_Interface_Data *sid,
61 Evas_Coord x, 61 Evas_Coord x,
62 Evas_Coord y); 62 Evas_Coord y);
63 63
64static Eina_Bool _elm_scroll_hold_animator(void *data, Eo *o, const Eo_Event_Description *desc, void *event_info); 64static Eina_Bool _elm_scroll_hold_animator(void *data, const Eo_Event *event);
65static Eina_Bool _elm_scroll_on_hold_animator(void *data, Eo *o, const Eo_Event_Description *desc, void *event_info); 65static Eina_Bool _elm_scroll_on_hold_animator(void *data, const Eo_Event *event);
66static Eina_Bool _elm_scroll_scroll_to_y_animator(void *data, Eo *o, const Eo_Event_Description *desc, void *event_info); 66static Eina_Bool _elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event);
67static Eina_Bool _elm_scroll_scroll_to_x_animator(void *data, Eo *o, const Eo_Event_Description *desc, void *event_info); 67static Eina_Bool _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event);
68static Eina_Bool _elm_scroll_bounce_y_animator(void *data, Eo *o, const Eo_Event_Description *desc, void *event_info); 68static Eina_Bool _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event);
69static Eina_Bool _elm_scroll_bounce_x_animator(void *data, Eo *o, const Eo_Event_Description *desc, void *event_info); 69static Eina_Bool _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event);
70static Eina_Bool _elm_scroll_momentum_animator(void *data, Eo *o, const Eo_Event_Description *desc, void *event_info); 70static Eina_Bool _elm_scroll_momentum_animator(void *data, const Eo_Event *event);
71 71
72static double 72static double
73_round(double value, int pos) 73_round(double value, int pos)
@@ -1304,7 +1304,7 @@ _elm_scroll_momentum_end(Elm_Scrollable_Smart_Interface_Data *sid)
1304} 1304}
1305 1305
1306static Eina_Bool 1306static Eina_Bool
1307_elm_scroll_bounce_x_animator(void *data, Eo *o EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 1307_elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
1308{ 1308{
1309 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(data, sid, EINA_FALSE); 1309 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(data, sid, EINA_FALSE);
1310 Evas_Coord x, y, dx, w, odx, ed, md; 1310 Evas_Coord x, y, dx, w, odx, ed, md;
@@ -1359,7 +1359,7 @@ _elm_scroll_bounce_x_animator(void *data, Eo *o EINA_UNUSED, const Eo_Event_Desc
1359} 1359}
1360 1360
1361static Eina_Bool 1361static Eina_Bool
1362_elm_scroll_bounce_y_animator(void *data, Eo *o EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 1362_elm_scroll_bounce_y_animator(void *data, const Eo_Event *event EINA_UNUSED)
1363{ 1363{
1364 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(data, sid, EINA_FALSE); 1364 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(data, sid, EINA_FALSE);
1365 Evas_Coord x, y, dy, h, ody, ed, md; 1365 Evas_Coord x, y, dy, h, ody, ed, md;
@@ -2088,7 +2088,7 @@ _paging_is_enabled(Elm_Scrollable_Smart_Interface_Data *sid)
2088} 2088}
2089 2089
2090static Eina_Bool 2090static Eina_Bool
2091_elm_scroll_momentum_animator(void *data, Eo *o EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 2091_elm_scroll_momentum_animator(void *data, const Eo_Event *event EINA_UNUSED)
2092{ 2092{
2093 double t, at, dt, p, r; 2093 double t, at, dt, p, r;
2094 Elm_Scrollable_Smart_Interface_Data *sid = data; 2094 Elm_Scrollable_Smart_Interface_Data *sid = data;
@@ -2267,7 +2267,7 @@ _elm_scroll_page_y_get(Elm_Scrollable_Smart_Interface_Data *sid,
2267} 2267}
2268 2268
2269static Eina_Bool 2269static Eina_Bool
2270_elm_scroll_scroll_to_x_animator(void *data, Eo *o EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 2270_elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
2271{ 2271{
2272 Elm_Scrollable_Smart_Interface_Data *sid = data; 2272 Elm_Scrollable_Smart_Interface_Data *sid = data;
2273 Evas_Coord px, py; 2273 Evas_Coord px, py;
@@ -2305,7 +2305,7 @@ _elm_scroll_scroll_to_x_animator(void *data, Eo *o EINA_UNUSED, const Eo_Event_D
2305} 2305}
2306 2306
2307static Eina_Bool 2307static Eina_Bool
2308_elm_scroll_scroll_to_y_animator(void *data, Eo *o EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 2308_elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event EINA_UNUSED)
2309{ 2309{
2310 Elm_Scrollable_Smart_Interface_Data *sid = data; 2310 Elm_Scrollable_Smart_Interface_Data *sid = data;
2311 Evas_Coord px, py; 2311 Evas_Coord px, py;
@@ -3101,10 +3101,7 @@ _elm_scroll_hold_enterer(void *data)
3101} 3101}
3102 3102
3103static Eina_Bool 3103static Eina_Bool
3104_elm_scroll_hold_animator(void *data, 3104_elm_scroll_hold_animator(void *data, const Eo_Event *event EINA_UNUSED)
3105 Eo *o EINA_UNUSED,
3106 const Eo_Event_Description *desc EINA_UNUSED,
3107 void *event_info EINA_UNUSED)
3108{ 3105{
3109 Elm_Scrollable_Smart_Interface_Data *sid = data; 3106 Elm_Scrollable_Smart_Interface_Data *sid = data;
3110 3107
@@ -3115,10 +3112,7 @@ _elm_scroll_hold_animator(void *data,
3115} 3112}
3116 3113
3117static Eina_Bool 3114static Eina_Bool
3118_elm_scroll_on_hold_animator(void *data, 3115_elm_scroll_on_hold_animator(void *data, const Eo_Event *event EINA_UNUSED)
3119 Eo *o EINA_UNUSED,
3120 const Eo_Event_Description *desc EINA_UNUSED,
3121 void *event_info EINA_UNUSED)
3122{ 3116{
3123 double t, td; 3117 double t, td;
3124 double vx, vy; 3118 double vx, vy;
@@ -3827,9 +3821,7 @@ _elm_scroll_pan_resized_cb(void *data,
3827 3821
3828/* even external pan objects get this */ 3822/* even external pan objects get this */
3829static Eina_Bool 3823static Eina_Bool
3830_elm_scroll_pan_changed_cb(void *data, 3824_elm_scroll_pan_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
3831 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
3832 void *event_info EINA_UNUSED)
3833{ 3825{
3834 Evas_Coord w = 0, h = 0; 3826 Evas_Coord w = 0, h = 0;
3835 Elm_Scrollable_Smart_Interface_Data *sid = data; 3827 Elm_Scrollable_Smart_Interface_Data *sid = data;
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 5dce3b2e1..395e4462c 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1143,10 +1143,7 @@ _zoom_do(Elm_Map_Data *sd,
1143} 1143}
1144 1144
1145static Eina_Bool 1145static Eina_Bool
1146_zoom_anim_cb(void *data, 1146_zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
1147 Eo *obj EINA_UNUSED,
1148 const Eo_Event_Description *desc EINA_UNUSED,
1149 void *event_info EINA_UNUSED)
1150{ 1147{
1151 ELM_MAP_DATA_GET(data, sd); 1148 ELM_MAP_DATA_GET(data, sd);
1152 1149
@@ -1166,10 +1163,7 @@ _zoom_anim_cb(void *data,
1166} 1163}
1167 1164
1168static Eina_Bool 1165static Eina_Bool
1169_zoom_bring_anim_cb(void *data, 1166_zoom_bring_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
1170 Eo *obj EINA_UNUSED,
1171 const Eo_Event_Description *desc EINA_UNUSED,
1172 void *event_info EINA_UNUSED)
1173{ 1167{
1174 ELM_MAP_DATA_GET(data, sd); 1168 ELM_MAP_DATA_GET(data, sd);
1175 1169
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 5d7cd15a5..3b6e22a6f 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -423,11 +423,9 @@ _menu_hide(void *data,
423} 423}
424 424
425static Eina_Bool 425static Eina_Bool
426_hover_dismissed_cb(void *data, 426_hover_dismissed_cb(void *data, const Eo_Event *event)
427 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
428 void *event_info)
429{ 427{
430 _menu_hide(data, obj, event_info); 428 _menu_hide(data, event->obj, event->event_info);
431 eo_do(data, eo_event_callback_call 429 eo_do(data, eo_event_callback_call
432 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL)); 430 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
433 eo_do(data, eo_event_callback_call(ELM_MENU_EVENT_DISMISSED, NULL)); 431 eo_do(data, eo_event_callback_call(ELM_MENU_EVENT_DISMISSED, NULL));
@@ -522,8 +520,7 @@ _menu_item_inactivate_cb(void *data,
522} 520}
523 521
524static Eina_Bool 522static Eina_Bool
525_block_menu(void *_sd, 523_block_menu(void *_sd, const Eo_Event *event EINA_UNUSED)
526 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
527{ 524{
528 const Eina_List *l; 525 const Eina_List *l;
529 Elm_Object_Item *eo_current; 526 Elm_Object_Item *eo_current;
@@ -542,8 +539,7 @@ _block_menu(void *_sd,
542} 539}
543 540
544static Eina_Bool 541static Eina_Bool
545_unblock_menu(void *_sd, 542_unblock_menu(void *_sd, const Eo_Event *event EINA_UNUSED)
546 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
547{ 543{
548 const Eina_List *l; 544 const Eina_List *l;
549 Elm_Object_Item *eo_current; 545 Elm_Object_Item *eo_current;
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 036df74bd..46777924c 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -1086,9 +1086,7 @@ _elm_panel_evas_object_smart_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x, Eva
1086// FIXME: This is definitively not an animator, but a pre calc function 1086// FIXME: This is definitively not an animator, but a pre calc function
1087// Not sure if I can hook on smart calc or on RENDER_PRE, will be left for later 1087// Not sure if I can hook on smart calc or on RENDER_PRE, will be left for later
1088static Eina_Bool 1088static Eina_Bool
1089_elm_panel_anim_cb(void *data, 1089_elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
1090 Eo *o EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
1091 void *event_info EINA_UNUSED)
1092{ 1090{
1093 Evas_Object *obj = data; 1091 Evas_Object *obj = data;
1094 ELM_PANEL_DATA_GET(obj, sd); 1092 ELM_PANEL_DATA_GET(obj, sd);
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index df3615404..60fce2e6c 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -233,8 +233,7 @@ _elm_photo_internal_image_follow(Evas_Object *obj)
233} 233}
234 234
235static Eina_Bool 235static Eina_Bool
236_on_thumb_done(void *data, 236_on_thumb_done(void *data, const Eo_Event *event EINA_UNUSED)
237 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
238{ 237{
239 _elm_photo_internal_image_follow(data); 238 _elm_photo_internal_image_follow(data);
240 239
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 97d878e5e..8c4b38b2c 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -766,10 +766,7 @@ _zoom_do(Evas_Object *obj,
766} 766}
767 767
768static Eina_Bool 768static Eina_Bool
769_zoom_anim_cb(void *data, 769_zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
770 Eo *o EINA_UNUSED,
771 const Eo_Event_Description *desc EINA_UNUSED,
772 void *event_info EINA_UNUSED)
773{ 770{
774 double t; 771 double t;
775 Evas_Object *obj = data; 772 Evas_Object *obj = data;
@@ -1040,10 +1037,7 @@ _elm_photocam_elm_widget_event(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED, Evas
1040} 1037}
1041 1038
1042static Eina_Bool 1039static Eina_Bool
1043_bounce_eval(void *data, 1040_bounce_eval(void *data, const Eo_Event *event EINA_UNUSED)
1044 Eo *o EINA_UNUSED,
1045 const Eo_Event_Description *desc EINA_UNUSED,
1046 void *event_info EINA_UNUSED)
1047{ 1041{
1048 Evas_Object *obj = data; 1042 Evas_Object *obj = data;
1049 ELM_PHOTOCAM_DATA_GET(obj, sd); 1043 ELM_PHOTOCAM_DATA_GET(obj, sd);
@@ -1970,7 +1964,9 @@ done:
1970 if (an) 1964 if (an)
1971 { 1965 {
1972 // FIXME: If one day we do support partial animator in photocam, this would require change 1966 // FIXME: If one day we do support partial animator in photocam, this would require change
1973 if (!_zoom_anim_cb(obj, evas_object_evas_get(obj), NULL, NULL)) 1967 Eo_Event event = {0};
1968 event.obj = evas_object_evas_get(obj);
1969 if (!_zoom_anim_cb(obj, &event))
1974 { 1970 {
1975 _elm_photocam_bounce_reset(obj, sd); 1971 _elm_photocam_bounce_reset(obj, sd);
1976 an = 0; 1972 an = 0;
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 82cd6aa0b..8eb3c03ae 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -42,17 +42,13 @@ static Eina_Bool _key_action_spin(Evas_Object *obj, const char *params);
42static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params); 42static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params);
43 43
44static Eina_Bool 44static Eina_Bool
45_inc_dec_button_clicked_cb(void *data, Eo *obj EINA_UNUSED, 45_inc_dec_button_clicked_cb(void *data, const Eo_Event *event);
46 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
47static Eina_Bool 46static Eina_Bool
48_inc_dec_button_pressed_cb(void *data, Eo *obj, 47_inc_dec_button_pressed_cb(void *data, const Eo_Event *event);
49 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
50static Eina_Bool 48static Eina_Bool
51_inc_dec_button_unpressed_cb(void *data, Eo *obj EINA_UNUSED, 49_inc_dec_button_unpressed_cb(void *data, const Eo_Event *event);
52 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED);
53static Eina_Bool 50static Eina_Bool
54_inc_dec_button_mouse_move_cb(void *data, Eo *obj EINA_UNUSED, 51_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event);
55 const Eo_Event_Description *desc EINA_UNUSED, void *event_info);
56 52
57static const Elm_Action key_actions[] = { 53static const Elm_Action key_actions[] = {
58 {"spin", _key_action_spin}, 54 {"spin", _key_action_spin},
@@ -375,9 +371,7 @@ _entry_value_apply(Evas_Object *obj)
375} 371}
376 372
377static Eina_Bool 373static Eina_Bool
378_entry_activated_cb(void *data, 374_entry_activated_cb(void *data, const Eo_Event *event EINA_UNUSED)
379 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
380 void *event_info EINA_UNUSED)
381{ 375{
382 _entry_value_apply(data); 376 _entry_value_apply(data);
383 377
@@ -793,9 +787,7 @@ _button_inc_dec_stop_cb(void *data,
793} 787}
794 788
795static Eina_Bool 789static Eina_Bool
796_inc_dec_button_clicked_cb(void *data, 790_inc_dec_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
797 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
798 void *event_info EINA_UNUSED)
799{ 791{
800 ELM_SPINNER_DATA_GET(data, sd); 792 ELM_SPINNER_DATA_GET(data, sd);
801 793
@@ -811,13 +803,11 @@ _inc_dec_button_clicked_cb(void *data,
811} 803}
812 804
813static Eina_Bool 805static Eina_Bool
814_inc_dec_button_pressed_cb(void *data, 806_inc_dec_button_pressed_cb(void *data, const Eo_Event *event)
815 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
816 void *event_info EINA_UNUSED)
817{ 807{
818 ELM_SPINNER_DATA_GET(data, sd); 808 ELM_SPINNER_DATA_GET(data, sd);
819 809
820 sd->inc_clicked = sd->inc_button == obj ? EINA_TRUE : EINA_FALSE; 810 sd->inc_clicked = sd->inc_button == event->obj ? EINA_TRUE : EINA_FALSE;
821 811
822 if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer); 812 if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer);
823 813
@@ -831,9 +821,7 @@ _inc_dec_button_pressed_cb(void *data,
831} 821}
832 822
833static Eina_Bool 823static Eina_Bool
834_inc_dec_button_unpressed_cb(void *data, 824_inc_dec_button_unpressed_cb(void *data, const Eo_Event *event EINA_UNUSED)
835 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
836 void *event_info EINA_UNUSED)
837{ 825{
838 ELM_SPINNER_DATA_GET(data, sd); 826 ELM_SPINNER_DATA_GET(data, sd);
839 827
@@ -849,9 +837,7 @@ _inc_dec_button_unpressed_cb(void *data,
849} 837}
850 838
851static Eina_Bool 839static Eina_Bool
852_text_button_clicked_cb(void *data, 840_text_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
853 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
854 void *event_info EINA_UNUSED)
855{ 841{
856 _toggle_entry(data); 842 _toggle_entry(data);
857 843
@@ -859,11 +845,9 @@ _text_button_clicked_cb(void *data,
859} 845}
860 846
861static Eina_Bool 847static Eina_Bool
862_inc_dec_button_mouse_move_cb(void *data, Eo *obj EINA_UNUSED, 848_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event)
863 const Eo_Event_Description *desc EINA_UNUSED,
864 void *event_info)
865{ 849{
866 Evas_Event_Mouse_Move *ev = event_info; 850 Evas_Event_Mouse_Move *ev = event->event_info;
867 ELM_SPINNER_DATA_GET(data, sd); 851 ELM_SPINNER_DATA_GET(data, sd);
868 852
869 if ((ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) && sd->longpress_timer) 853 if ((ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) && sd->longpress_timer)
diff --git a/src/lib/elm_store.c b/src/lib/elm_store.c
index b4eaf2b7e..129ac6525 100644
--- a/src/lib/elm_store.c
+++ b/src/lib/elm_store.c
@@ -224,10 +224,10 @@ _store_item_eval(void *data)
224} 224}
225 225
226static Eina_Bool 226static Eina_Bool
227_store_genlist_item_realized(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 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_info; 230 Elm_Object_Item *gli = event->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++;
@@ -238,10 +238,10 @@ _store_genlist_item_realized(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Des
238} 238}
239 239
240static Eina_Bool 240static Eina_Bool
241_store_genlist_item_unrealized(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 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_info; 244 Elm_Object_Item *gli = event->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/elm_video.c b/src/lib/elm_video.c
index 5766e69f4..d5b2a0a91 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -29,29 +29,17 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
29 29
30 30
31static Eina_Bool 31static Eina_Bool
32_on_open_done(void *data, 32_on_open_done(void *data, const Eo_Event *event);
33 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
34 void *event_info EINA_UNUSED);
35static Eina_Bool 33static Eina_Bool
36_on_playback_started(void *data, 34_on_playback_started(void *data, const Eo_Event *event);
37 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
38 void *event_info EINA_UNUSED);
39static Eina_Bool 35static Eina_Bool
40_on_playback_finished(void *data, 36_on_playback_finished(void *data, const Eo_Event *event);
41 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
42 void *event_info EINA_UNUSED);
43static Eina_Bool 37static Eina_Bool
44_on_aspect_ratio_updated(void *data, 38_on_aspect_ratio_updated(void *data, const Eo_Event *event);
45 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
46 void *event_info EINA_UNUSED);
47static Eina_Bool 39static Eina_Bool
48_on_title_changed(void *data, 40_on_title_changed(void *data, const Eo_Event *event);
49 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
50 void *event_info EINA_UNUSED);
51static Eina_Bool 41static Eina_Bool
52_on_audio_level_changed(void *data, 42_on_audio_level_changed(void *data, const Eo_Event *event);
53 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
54 void *event_info EINA_UNUSED);
55 43
56static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); 44static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
57static Eina_Bool _key_action_play(Evas_Object *obj, const char *params); 45static Eina_Bool _key_action_play(Evas_Object *obj, const char *params);
@@ -171,9 +159,7 @@ _on_size_hints_changed(void *data EINA_UNUSED,
171} 159}
172 160
173static Eina_Bool 161static Eina_Bool
174_on_open_done(void *data, 162_on_open_done(void *data, const Eo_Event *event EINA_UNUSED)
175 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
176 void *event_info EINA_UNUSED)
177{ 163{
178 elm_layout_signal_emit(data, "elm,video,open", "elm"); 164 elm_layout_signal_emit(data, "elm,video,open", "elm");
179 165
@@ -181,9 +167,7 @@ _on_open_done(void *data,
181} 167}
182 168
183static Eina_Bool 169static Eina_Bool
184_on_playback_started(void *data, 170_on_playback_started(void *data, const Eo_Event *event EINA_UNUSED)
185 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
186 void *event_info EINA_UNUSED)
187{ 171{
188 elm_layout_signal_emit(data, "elm,video,play", "elm"); 172 elm_layout_signal_emit(data, "elm,video,play", "elm");
189 173
@@ -192,9 +176,7 @@ _on_playback_started(void *data,
192} 176}
193 177
194static Eina_Bool 178static Eina_Bool
195_on_playback_finished(void *data, 179_on_playback_finished(void *data, const Eo_Event *event EINA_UNUSED)
196 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
197 void *event_info EINA_UNUSED)
198{ 180{
199 ELM_VIDEO_DATA_GET(data, sd); 181 ELM_VIDEO_DATA_GET(data, sd);
200 emotion_object_play_set(sd->emotion, EINA_FALSE); 182 emotion_object_play_set(sd->emotion, EINA_FALSE);
@@ -204,9 +186,7 @@ _on_playback_finished(void *data,
204} 186}
205 187
206static Eina_Bool 188static Eina_Bool
207_on_aspect_ratio_updated(void *data, 189_on_aspect_ratio_updated(void *data, const Eo_Event *event EINA_UNUSED)
208 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
209 void *event_info EINA_UNUSED)
210{ 190{
211 elm_layout_sizing_eval(data); 191 elm_layout_sizing_eval(data);
212 192
@@ -214,9 +194,7 @@ _on_aspect_ratio_updated(void *data,
214} 194}
215 195
216static Eina_Bool 196static Eina_Bool
217_on_title_changed(void *data, 197_on_title_changed(void *data, const Eo_Event *event EINA_UNUSED)
218 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
219 void *event_info EINA_UNUSED)
220{ 198{
221 const char *title; 199 const char *title;
222 200
@@ -230,9 +208,7 @@ _on_title_changed(void *data,
230} 208}
231 209
232static Eina_Bool 210static Eina_Bool
233_on_audio_level_changed(void *data, 211_on_audio_level_changed(void *data, const Eo_Event *event EINA_UNUSED)
234 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED,
235 void *event_info EINA_UNUSED)
236{ 212{
237 (void)data; 213 (void)data;
238 214
diff --git a/src/lib/elm_view_form.c b/src/lib/elm_view_form.c
index 7437a95e7..6a6dab912 100644
--- a/src/lib/elm_view_form.c
+++ b/src/lib/elm_view_form.c
@@ -39,9 +39,9 @@ struct _Elm_View_Form_Data
39}; 39};
40 40
41static Eina_Bool 41static Eina_Bool
42_efl_model_properties_change_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 42_efl_model_properties_change_cb(void *data, const Eo_Event *event)
43{ 43{
44 const Efl_Model_Property_Event *evt = event_info; 44 const Efl_Model_Property_Event *evt = event->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/elm_view_list.c b/src/lib/elm_view_list.c
index 271a2428a..bb0d2534e 100644
--- a/src/lib/elm_view_list.c
+++ b/src/lib/elm_view_list.c
@@ -38,13 +38,13 @@ struct _View_List_ItemData
38}; 38};
39 39
40static void _efl_model_load_children(View_List_ItemData *); 40static void _efl_model_load_children(View_List_ItemData *);
41static Eina_Bool _efl_model_load_status_change_cb(void *, Eo *, const Eo_Event_Description *, void *); 41static Eina_Bool _efl_model_load_status_change_cb(void *, const Eo_Event *event);
42static Eina_Bool _efl_model_children_count_change_cb(void *, Eo *, const Eo_Event_Description *, void *); 42static Eina_Bool _efl_model_children_count_change_cb(void *, const Eo_Event *event);
43static Eina_Bool _efl_model_properties_change_cb(void *, Eo *, const Eo_Event_Description *, void *); 43static Eina_Bool _efl_model_properties_change_cb(void *, const Eo_Event *event);
44 44
45static Eina_Bool _expand_request_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info); 45static Eina_Bool _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event);
46static Eina_Bool _contract_request_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info); 46static Eina_Bool _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event);
47static Eina_Bool _contracted_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info); 47static Eina_Bool _contracted_cb(void *data EINA_UNUSED, const Eo_Event *event);
48 48
49/* --- Genlist Callbacks --- */ 49/* --- Genlist Callbacks --- */
50EO_CALLBACKS_ARRAY_DEFINE(model_callbacks, 50EO_CALLBACKS_ARRAY_DEFINE(model_callbacks,
@@ -159,9 +159,9 @@ _item_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part)
159} 159}
160 160
161static Eina_Bool 161static Eina_Bool
162_expand_request_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 162_expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
163{ 163{
164 Elm_Object_Item *item = event_info; 164 Elm_Object_Item *item = event->event_info;
165 View_List_ItemData *idata = elm_object_item_data_get(item); 165 View_List_ItemData *idata = elm_object_item_data_get(item);
166 Efl_Model_Load_Status st = EFL_MODEL_LOAD_STATUS_ERROR; 166 Efl_Model_Load_Status st = EFL_MODEL_LOAD_STATUS_ERROR;
167 167
@@ -182,9 +182,9 @@ _expand_request_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_D
182} 182}
183 183
184static Eina_Bool 184static Eina_Bool
185_contract_request_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 185_contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
186{ 186{
187 Elm_Object_Item *item = event_info; 187 Elm_Object_Item *item = event->event_info;
188 View_List_ItemData *idata = elm_object_item_data_get(item); 188 View_List_ItemData *idata = elm_object_item_data_get(item);
189 189
190 eo_do(idata->model, eo_event_callback_array_del(model_callbacks(), idata)); 190 eo_do(idata->model, eo_event_callback_array_del(model_callbacks(), idata));
@@ -193,9 +193,9 @@ _contract_request_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event
193} 193}
194 194
195static Eina_Bool 195static Eina_Bool
196_contracted_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info) 196_contracted_cb(void *data EINA_UNUSED, const Eo_Event *event)
197{ 197{
198 Elm_Object_Item *glit = event_info; 198 Elm_Object_Item *glit = event->event_info;
199 elm_genlist_item_subitems_clear(glit); 199 elm_genlist_item_subitems_clear(glit);
200 return EINA_TRUE; 200 return EINA_TRUE;
201} 201}
@@ -217,11 +217,10 @@ _genlist_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_
217 217
218/* --- Efl_Model Callbacks --- */ 218/* --- Efl_Model Callbacks --- */
219static Eina_Bool 219static Eina_Bool
220_efl_model_properties_change_cb(void *data, Eo *obj EINA_UNUSED, 220_efl_model_properties_change_cb(void *data, const Eo_Event *event)
221 const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
222{ 221{
223 View_List_ItemData *idata = data; 222 View_List_ItemData *idata = data;
224 Efl_Model_Property_Event *evt = event_info; 223 Efl_Model_Property_Event *evt = event->event_info;
225 224
226 EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_TRUE); 225 EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_TRUE);
227 EINA_SAFETY_ON_NULL_RETURN_VAL(evt, EINA_TRUE); 226 EINA_SAFETY_ON_NULL_RETURN_VAL(evt, EINA_TRUE);
@@ -272,8 +271,7 @@ _efl_model_load_children(View_List_ItemData *pdata)
272} 271}
273 272
274static Eina_Bool 273static Eina_Bool
275_efl_model_children_count_change_cb(void *data, Eo *obj EINA_UNUSED, 274_efl_model_children_count_change_cb(void *data, const Eo_Event *event EINA_UNUSED)
276 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
277{ 275{
278 View_List_ItemData *idata = data; 276 View_List_ItemData *idata = data;
279 EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_FALSE); 277 EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_FALSE);
@@ -288,11 +286,10 @@ _efl_model_children_count_change_cb(void *data, Eo *obj EINA_UNUSED,
288} 286}
289 287
290static Eina_Bool 288static Eina_Bool
291_efl_model_load_status_change_cb(void *data, Eo *obj EINA_UNUSED, 289_efl_model_load_status_change_cb(void *data, const Eo_Event *event)
292 const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
293{ 290{
294 View_List_ItemData *idata = data; 291 View_List_ItemData *idata = data;
295 Efl_Model_Load *load = event_info; 292 Efl_Model_Load *load = event->event_info;
296 293
297 if (load->status & EFL_MODEL_LOAD_STATUS_UNLOADED) 294 if (load->status & EFL_MODEL_LOAD_STATUS_UNLOADED)
298 { 295 {
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index b13a2d933..53d4a8a37 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -86,20 +86,11 @@ _elm_scrollable_is(const Evas_Object *obj)
86} 86}
87 87
88static Eina_Bool 88static Eina_Bool
89_on_sub_obj_del(void *data, 89_on_sub_obj_del(void *data, const Eo_Event *event);
90 Eo *obj,
91 const Eo_Event_Description *desc,
92 void *event_info);
93static Eina_Bool 90static Eina_Bool
94_on_sub_obj_hide(void *data, 91_on_sub_obj_hide(void *data, const Eo_Event *event);
95 Eo *obj,
96 const Eo_Event_Description *desc,
97 void *event_info);
98static Eina_Bool 92static Eina_Bool
99_propagate_event(void *data, 93_propagate_event(void *data, const Eo_Event *event);
100 Eo *obj,
101 const Eo_Event_Description *desc,
102 void *event_info);
103 94
104EO_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks, 95EO_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
105 { EVAS_OBJECT_EVENT_DEL, _on_sub_obj_del }, 96 { EVAS_OBJECT_EVENT_DEL, _on_sub_obj_del },
@@ -246,40 +237,34 @@ _parents_unfocus(Evas_Object *obj)
246} 237}
247 238
248static Eina_Bool 239static Eina_Bool
249_on_sub_obj_hide(void *data EINA_UNUSED, 240_on_sub_obj_hide(void *data EINA_UNUSED, const Eo_Event *event)
250 Eo *obj,
251 const Eo_Event_Description *desc EINA_UNUSED,
252 void *event_info EINA_UNUSED)
253{ 241{
254 elm_widget_focus_hide_handle(obj); 242 elm_widget_focus_hide_handle(event->obj);
255 return EO_CALLBACK_CONTINUE; 243 return EO_CALLBACK_CONTINUE;
256} 244}
257 245
258static Eina_Bool 246static Eina_Bool
259_on_sub_obj_del(void *data, 247_on_sub_obj_del(void *data, const Eo_Event *event)
260 Eo *obj,
261 const Eo_Event_Description *desc EINA_UNUSED,
262 void *event_info EINA_UNUSED)
263{ 248{
264 ELM_WIDGET_DATA_GET(data, sd); 249 ELM_WIDGET_DATA_GET(data, sd);
265 250
266 if (_elm_widget_is(obj)) 251 if (_elm_widget_is(event->obj))
267 { 252 {
268 if (elm_widget_focus_get(obj)) _parents_unfocus(sd->obj); 253 if (elm_widget_focus_get(event->obj)) _parents_unfocus(sd->obj);
269 } 254 }
270 if (obj == sd->resize_obj) 255 if (event->obj == sd->resize_obj)
271 { 256 {
272 /* already dels sub object */ 257 /* already dels sub object */
273 elm_widget_resize_object_set(sd->obj, NULL, EINA_TRUE); 258 elm_widget_resize_object_set(sd->obj, NULL, EINA_TRUE);
274 } 259 }
275 else if (obj == sd->hover_obj) 260 else if (event->obj == sd->hover_obj)
276 { 261 {
277 sd->hover_obj = NULL; 262 sd->hover_obj = NULL;
278 } 263 }
279 else 264 else
280 { 265 {
281 if (!elm_widget_sub_object_del(sd->obj, obj)) 266 if (!elm_widget_sub_object_del(sd->obj, event->obj))
282 ERR("failed to remove sub object %p from %p\n", obj, sd->obj); 267 ERR("failed to remove sub object %p from %p\n", event->obj, sd->obj);
283 } 268 }
284 269
285 return EO_CALLBACK_CONTINUE; 270 return EO_CALLBACK_CONTINUE;
@@ -699,37 +684,35 @@ _propagate_y_drag_lock(Evas_Object *obj,
699} 684}
700 685
701static Eina_Bool 686static Eina_Bool
702_propagate_event(void *data EINA_UNUSED, 687_propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
703 Eo *obj,
704 const Eo_Event_Description *desc,
705 void *event_info)
706{ 688{
689 Eo *obj = event->obj;
707 INTERNAL_ENTRY EO_CALLBACK_CONTINUE; 690 INTERNAL_ENTRY EO_CALLBACK_CONTINUE;
708 Evas_Callback_Type type; 691 Evas_Callback_Type type;
709 Evas_Event_Flags *event_flags = NULL; 692 Evas_Event_Flags *event_flags = NULL;
710 693
711 if (desc == EVAS_OBJECT_EVENT_KEY_DOWN) 694 if (event->desc == EVAS_OBJECT_EVENT_KEY_DOWN)
712 { 695 {
713 Evas_Event_Key_Down *ev = event_info; 696 Evas_Event_Key_Down *ev = event->event_info;
714 event_flags = &(ev->event_flags); 697 event_flags = &(ev->event_flags);
715 type = EVAS_CALLBACK_KEY_DOWN; 698 type = EVAS_CALLBACK_KEY_DOWN;
716 } 699 }
717 else if (desc == EVAS_OBJECT_EVENT_KEY_UP) 700 else if (event->desc == EVAS_OBJECT_EVENT_KEY_UP)
718 { 701 {
719 Evas_Event_Key_Up *ev = event_info; 702 Evas_Event_Key_Up *ev = event->event_info;
720 event_flags = &(ev->event_flags); 703 event_flags = &(ev->event_flags);
721 type = EVAS_CALLBACK_KEY_UP; 704 type = EVAS_CALLBACK_KEY_UP;
722 } 705 }
723 else if (desc == EVAS_OBJECT_EVENT_MOUSE_WHEEL) 706 else if (event->desc == EVAS_OBJECT_EVENT_MOUSE_WHEEL)
724 { 707 {
725 Evas_Event_Mouse_Wheel *ev = event_info; 708 Evas_Event_Mouse_Wheel *ev = event->event_info;
726 event_flags = &(ev->event_flags); 709 event_flags = &(ev->event_flags);
727 type = EVAS_CALLBACK_MOUSE_WHEEL; 710 type = EVAS_CALLBACK_MOUSE_WHEEL;
728 } 711 }
729 else 712 else
730 return EO_CALLBACK_CONTINUE; 713 return EO_CALLBACK_CONTINUE;
731 714
732 elm_widget_event_propagate(obj, type, event_info, event_flags); 715 elm_widget_event_propagate(obj, type, event->event_info, event_flags);
733 716
734 return EO_CALLBACK_CONTINUE; 717 return EO_CALLBACK_CONTINUE;
735} 718}
@@ -4284,19 +4267,15 @@ _track_obj_update(Evas_Object *track, Evas_Object *obj)
4284} 4267}
4285 4268
4286static Eina_Bool 4269static Eina_Bool
4287_track_obj_view_update(void *data, Eo *obj, 4270_track_obj_view_update(void *data, const Eo_Event *event)
4288 const Eo_Event_Description *desc EINA_UNUSED,
4289 void *event_info EINA_UNUSED)
4290{ 4271{
4291 Elm_Widget_Item_Data *item = data; 4272 Elm_Widget_Item_Data *item = data;
4292 _track_obj_update(item->track_obj, obj); 4273 _track_obj_update(item->track_obj, event->obj);
4293 return EO_CALLBACK_CONTINUE; 4274 return EO_CALLBACK_CONTINUE;
4294} 4275}
4295 4276
4296static Eina_Bool 4277static Eina_Bool
4297_track_obj_view_del(void *data, Eo *obj EINA_UNUSED, 4278_track_obj_view_del(void *data, const Eo_Event *event);
4298 const Eo_Event_Description *desc EINA_UNUSED,
4299 void *event_info EINA_UNUSED);
4300 4279
4301EO_CALLBACKS_ARRAY_DEFINE(tracker_callbacks, 4280EO_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
4302 { EVAS_OBJECT_EVENT_RESIZE, _track_obj_view_update }, 4281 { EVAS_OBJECT_EVENT_RESIZE, _track_obj_view_update },
@@ -4306,9 +4285,7 @@ EO_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
4306 { EVAS_OBJECT_EVENT_DEL, _track_obj_view_del }); 4285 { EVAS_OBJECT_EVENT_DEL, _track_obj_view_del });
4307 4286
4308static Eina_Bool 4287static Eina_Bool
4309_track_obj_view_del(void *data, Eo *obj EINA_UNUSED, 4288_track_obj_view_del(void *data, const Eo_Event *event EINA_UNUSED)
4310 const Eo_Event_Description *desc EINA_UNUSED,
4311 void *event_info EINA_UNUSED)
4312{ 4289{
4313 Elm_Widget_Item_Data *item = data; 4290 Elm_Widget_Item_Data *item = data;
4314 4291
@@ -4371,12 +4348,12 @@ _elm_widget_item_signal_callback_list_get(Elm_Widget_Item_Data *item, Eina_List
4371#define ERR_NOT_SUPPORTED(item, method) ERR("%s does not support %s API.", elm_widget_type_get(item->widget), method); 4348#define ERR_NOT_SUPPORTED(item, method) ERR("%s does not support %s API.", elm_widget_type_get(item->widget), method);
4372 4349
4373static Eina_Bool 4350static Eina_Bool
4374_eo_del_cb(void *data EINA_UNUSED, Eo *eo_item, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 4351_eo_del_cb(void *data EINA_UNUSED, const Eo_Event *event)
4375{ 4352{
4376 Elm_Widget_Item_Data *item = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS); 4353 Elm_Widget_Item_Data *item = eo_data_scope_get(event->obj, ELM_WIDGET_ITEM_CLASS);
4377 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_TRUE); 4354 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_TRUE);
4378 if (item->del_func) 4355 if (item->del_func)
4379 item->del_func((void *) WIDGET_ITEM_DATA_GET(eo_item), item->widget, item->eo_obj); 4356 item->del_func((void *) WIDGET_ITEM_DATA_GET(event->obj), item->widget, item->eo_obj);
4380 return EINA_TRUE; 4357 return EINA_TRUE;
4381} 4358}
4382 4359
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 8004d295e..03b3006df 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -5677,7 +5677,7 @@ elm_win_window_id_get(const Evas_Object *obj)
5677} 5677}
5678 5678
5679static Eina_Bool 5679static Eina_Bool
5680_on_atspi_bus_connected(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 5680_on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
5681{ 5681{
5682 Evas_Object *win; 5682 Evas_Object *win;
5683 Eina_List *l; 5683 Eina_List *l;
diff --git a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index 8e2d39789..d62dfb169 100644
--- a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -34,12 +34,11 @@ _diskselector_item_free_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event
34} 34}
35 35
36static Eina_Bool 36static Eina_Bool
37_ctxpopup_dismissed_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, 37_ctxpopup_dismissed_cb(void *data, const Eo_Event *event)
38 void *event_info EINA_UNUSED)
39{ 38{
40 Ctxpopup_Module_Data *ctx_mod; 39 Ctxpopup_Module_Data *ctx_mod;
41 ctx_mod = (Ctxpopup_Module_Data *)data; 40 ctx_mod = (Ctxpopup_Module_Data *)data;
42 evas_object_del(obj); 41 evas_object_del(event->obj);
43 ctx_mod->ctxpopup = NULL; 42 ctx_mod->ctxpopup = NULL;
44 43
45 return EINA_TRUE; 44 return EINA_TRUE;
@@ -88,14 +87,13 @@ _field_value_get(struct tm *tim, Elm_Datetime_Field_Type field_type)
88} 87}
89 88
90static Eina_Bool 89static Eina_Bool
91_diskselector_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, 90_diskselector_cb(void *data EINA_UNUSED, const Eo_Event *event)
92 const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
93{ 91{
94 DiskItem_Data *disk_data; 92 DiskItem_Data *disk_data;
95 struct tm curr_time; 93 struct tm curr_time;
96 const char *fmt; 94 const char *fmt;
97 95
98 disk_data = (DiskItem_Data *)elm_object_item_data_get(event_info); 96 disk_data = (DiskItem_Data *)elm_object_item_data_get(event->event_info);
99 if (!disk_data || !(disk_data->ctx_mod)) return EINA_FALSE; 97 if (!disk_data || !(disk_data->ctx_mod)) return EINA_FALSE;
100 98
101 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);
@@ -111,9 +109,7 @@ _diskselector_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
111} 109}
112 110
113static Eina_Bool 111static Eina_Bool
114_ampm_clicked_cb(void *data, Eo *obj EINA_UNUSED, 112_ampm_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
115 const Eo_Event_Description *desc EINA_UNUSED,
116 void *event_info EINA_UNUSED)
117{ 113{
118 Ctxpopup_Module_Data *ctx_mod; 114 Ctxpopup_Module_Data *ctx_mod;
119 struct tm curr_time; 115 struct tm curr_time;
@@ -129,9 +125,7 @@ _ampm_clicked_cb(void *data, Eo *obj EINA_UNUSED,
129} 125}
130 126
131static Eina_Bool 127static Eina_Bool
132_field_clicked_cb(void *data, Eo *obj, 128_field_clicked_cb(void *data, const Eo_Event *event)
133 const Eo_Event_Description *desc EINA_UNUSED,
134 void *event_info EINA_UNUSED)
135{ 129{
136 Ctxpopup_Module_Data *ctx_mod; 130 Ctxpopup_Module_Data *ctx_mod;
137 Evas_Object *diskselector; 131 Evas_Object *diskselector;
@@ -149,9 +143,9 @@ _field_clicked_cb(void *data, Eo *obj,
149 ctx_mod = (Ctxpopup_Module_Data *)data; 143 ctx_mod = (Ctxpopup_Module_Data *)data;
150 if (!ctx_mod) return EINA_FALSE; 144 if (!ctx_mod) return EINA_FALSE;
151 145
152 snprintf(buf, sizeof(buf), "datetime/%s", elm_object_style_get(obj)); 146 snprintf(buf, sizeof(buf), "datetime/%s", elm_object_style_get(event->obj));
153 147
154 ctx_mod->ctxpopup = elm_ctxpopup_add(obj); 148 ctx_mod->ctxpopup = elm_ctxpopup_add(event->obj);
155 elm_object_style_set(ctx_mod->ctxpopup, buf); 149 elm_object_style_set(ctx_mod->ctxpopup, buf);
156 elm_ctxpopup_horizontal_set(ctx_mod->ctxpopup, EINA_TRUE); 150 elm_ctxpopup_horizontal_set(ctx_mod->ctxpopup, EINA_TRUE);
157 evas_object_size_hint_weight_set(ctx_mod->ctxpopup, EVAS_HINT_EXPAND, 151 evas_object_size_hint_weight_set(ctx_mod->ctxpopup, EVAS_HINT_EXPAND,
@@ -159,7 +153,7 @@ _field_clicked_cb(void *data, Eo *obj,
159 evas_object_size_hint_align_set(ctx_mod->ctxpopup, EVAS_HINT_FILL, 0.5); 153 evas_object_size_hint_align_set(ctx_mod->ctxpopup, EVAS_HINT_FILL, 0.5);
160 eo_do(ctx_mod->ctxpopup, eo_event_callback_add 154 eo_do(ctx_mod->ctxpopup, eo_event_callback_add
161 (ELM_CTXPOPUP_EVENT_DISMISSED, _ctxpopup_dismissed_cb, ctx_mod)); 155 (ELM_CTXPOPUP_EVENT_DISMISSED, _ctxpopup_dismissed_cb, ctx_mod));
162 elm_ctxpopup_hover_parent_set(ctx_mod->ctxpopup, elm_widget_top_get(obj)); 156 elm_ctxpopup_hover_parent_set(ctx_mod->ctxpopup, elm_widget_top_get(event->obj));
163 157
164 diskselector = elm_diskselector_add(elm_widget_top_get(ctx_mod->mod_data.base)); 158 diskselector = elm_diskselector_add(elm_widget_top_get(ctx_mod->mod_data.base));
165 eo_do(diskselector, eo_event_callback_add 159 eo_do(diskselector, eo_event_callback_add
@@ -170,7 +164,7 @@ _field_clicked_cb(void *data, Eo *obj,
170 t = time(NULL); 164 t = time(NULL);
171 localtime_r(&t, &time1); 165 localtime_r(&t, &time1);
172 166
173 field_type = (Elm_Datetime_Field_Type )evas_object_data_get(obj, "_field_type"); 167 field_type = (Elm_Datetime_Field_Type )evas_object_data_get(event->obj, "_field_type");
174 fmt = ctx_mod->mod_data.field_format_get(ctx_mod->mod_data.base, field_type); 168 fmt = ctx_mod->mod_data.field_format_get(ctx_mod->mod_data.base, field_type);
175 elm_datetime_value_get(ctx_mod->mod_data.base, &time1); 169 elm_datetime_value_get(ctx_mod->mod_data.base, &time1);
176 val = _field_value_get(&time1, field_type); 170 val = _field_value_get(&time1, field_type);
@@ -207,7 +201,7 @@ _field_clicked_cb(void *data, Eo *obj,
207 } 201 }
208 elm_diskselector_side_text_max_length_set(diskselector, text_len); 202 elm_diskselector_side_text_max_length_set(diskselector, text_len);
209 203
210 evas_object_geometry_get(obj, &x, &y, &w, &h); 204 evas_object_geometry_get(event->obj, &x, &y, &w, &h);
211 evas_object_geometry_get(elm_widget_top_get(ctx_mod->mod_data.base), NULL, NULL, &width, NULL); 205 evas_object_geometry_get(elm_widget_top_get(ctx_mod->mod_data.base), NULL, NULL, &width, NULL);
212 evas_object_size_hint_min_set(ctx_mod->ctxpopup, width, -1); 206 evas_object_size_hint_min_set(ctx_mod->ctxpopup, width, -1);
213 display_item_num = width / (w + elm_config_finger_size_get()); 207 display_item_num = width / (w + elm_config_finger_size_get());
diff --git a/src/modules/prefs/elm_button.c b/src/modules/prefs/elm_button.c
index cff42e32b..25e97599c 100644
--- a/src/modules/prefs/elm_button.c
+++ b/src/modules/prefs/elm_button.c
@@ -9,13 +9,11 @@ static Elm_Prefs_Item_Type supported_types[] =
9}; 9};
10 10
11static Eina_Bool 11static Eina_Bool
12_item_changed_cb(void *data, 12_item_changed_cb(void *data, const Eo_Event *event)
13 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
14 void *event_info EINA_UNUSED)
15{ 13{
16 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; 14 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
17 15
18 prefs_it_changed_cb(obj); 16 prefs_it_changed_cb(event->obj);
19 return EINA_TRUE; 17 return EINA_TRUE;
20} 18}
21 19
diff --git a/src/modules/prefs/elm_check.c b/src/modules/prefs/elm_check.c
index b41243ea3..c5da5527e 100644
--- a/src/modules/prefs/elm_check.c
+++ b/src/modules/prefs/elm_check.c
@@ -7,13 +7,11 @@ static Elm_Prefs_Item_Type supported_types[] =
7}; 7};
8 8
9static Eina_Bool 9static Eina_Bool
10_item_changed_cb(void *data, 10_item_changed_cb(void *data, const Eo_Event *event)
11 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
12 void *event_info EINA_UNUSED)
13{ 11{
14 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; 12 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
15 13
16 prefs_it_changed_cb(obj); 14 prefs_it_changed_cb(event->obj);
17 return EINA_TRUE; 15 return EINA_TRUE;
18} 16}
19 17
diff --git a/src/modules/prefs/elm_datetime.c b/src/modules/prefs/elm_datetime.c
index 3637e9193..cf076d5b6 100644
--- a/src/modules/prefs/elm_datetime.c
+++ b/src/modules/prefs/elm_datetime.c
@@ -7,13 +7,11 @@ static Elm_Prefs_Item_Type supported_types[] =
7}; 7};
8 8
9static Eina_Bool 9static Eina_Bool
10_item_changed_cb(void *data, 10_item_changed_cb(void *data, const Eo_Event *event)
11 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
12 void *event_info EINA_UNUSED)
13{ 11{
14 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; 12 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
15 13
16 prefs_it_changed_cb(obj); 14 prefs_it_changed_cb(event->obj);
17 return EINA_TRUE; 15 return EINA_TRUE;
18} 16}
19 17
diff --git a/src/modules/prefs/elm_entry.c b/src/modules/prefs/elm_entry.c
index ac299cba4..3c15451e2 100644
--- a/src/modules/prefs/elm_entry.c
+++ b/src/modules/prefs/elm_entry.c
@@ -96,13 +96,11 @@ mismatch:
96} 96}
97 97
98static Eina_Bool 98static Eina_Bool
99_item_changed_cb(void *data, 99_item_changed_cb(void *data, const Eo_Event *event)
100 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
101 void *event_info EINA_UNUSED)
102{ 100{
103 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; 101 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
104 102
105 prefs_it_changed_cb(obj); 103 prefs_it_changed_cb(event->obj);
106 return EINA_TRUE; 104 return EINA_TRUE;
107} 105}
108 106
diff --git a/src/modules/prefs/elm_slider.c b/src/modules/prefs/elm_slider.c
index bc6463530..84bc41841 100644
--- a/src/modules/prefs/elm_slider.c
+++ b/src/modules/prefs/elm_slider.c
@@ -8,13 +8,11 @@ static Elm_Prefs_Item_Type supported_types[] =
8}; 8};
9 9
10static Eina_Bool 10static Eina_Bool
11_item_changed_cb(void *data, 11_item_changed_cb(void *data, const Eo_Event *event)
12 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
13 void *event_info EINA_UNUSED)
14{ 12{
15 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; 13 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
16 14
17 prefs_it_changed_cb(obj); 15 prefs_it_changed_cb(event->obj);
18 return EINA_TRUE; 16 return EINA_TRUE;
19} 17}
20 18
diff --git a/src/modules/prefs/elm_spinner.c b/src/modules/prefs/elm_spinner.c
index 6617e33c4..45bfd85bc 100644
--- a/src/modules/prefs/elm_spinner.c
+++ b/src/modules/prefs/elm_spinner.c
@@ -8,13 +8,11 @@ static Elm_Prefs_Item_Type supported_types[] =
8}; 8};
9 9
10static Eina_Bool 10static Eina_Bool
11_item_changed_cb(void *data, 11_item_changed_cb(void *data, const Eo_Event *event)
12 Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
13 void *event_info EINA_UNUSED)
14{ 12{
15 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data; 13 Elm_Prefs_Item_Changed_Cb prefs_it_changed_cb = data;
16 14
17 prefs_it_changed_cb(obj); 15 prefs_it_changed_cb(event->obj);
18 return EINA_TRUE; 16 return EINA_TRUE;
19} 17}
20 18