summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-04-12 15:23:55 +0100
committerTom Hacohen <tom@stosb.com>2016-04-12 15:23:55 +0100
commitf14305024e28d9d427b69a2fc2ebc9f842f25353 (patch)
tree26e4adc8a26ed7789cb6c3682ca04740a4c6d091 /src/lib/elementary
parent736fb9d4980a7dee83ca0721d8b9b58c6c12a39d (diff)
Eo event: rename Eo_Event->event_info to Eo_Event->info.
The previous naming was redundant and too long.
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/elc_combobox.c2
-rw-r--r--src/lib/elementary/elc_fileselector.c18
-rw-r--r--src/lib/elementary/elc_fileselector_button.c2
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c8
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c12
-rw-r--r--src/lib/elementary/elm_box.c8
-rw-r--r--src/lib/elementary/elm_color_class.c2
-rw-r--r--src/lib/elementary/elm_entry.c4
-rw-r--r--src/lib/elementary/elm_glview.c2
-rw-r--r--src/lib/elementary/elm_helper.c2
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.c2
-rw-r--r--src/lib/elementary/elm_menu.c2
-rw-r--r--src/lib/elementary/elm_spinner.c2
-rw-r--r--src/lib/elementary/elm_store.c4
-rw-r--r--src/lib/elementary/elm_view_form.c2
-rw-r--r--src/lib/elementary/elm_view_list.c10
-rw-r--r--src/lib/elementary/elm_widget.c8
17 files changed, 45 insertions, 45 deletions
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 65e82051b8..792017ea60 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -228,7 +228,7 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event)
228 return EINA_TRUE; 228 return EINA_TRUE;
229 } 229 }
230 230
231 eo_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->event_info); 231 eo_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info);
232 232
233 if (sd->count > 0) 233 if (sd->count > 0)
234 { 234 {
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 7f230654d1..79f5e26ae9 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -701,7 +701,7 @@ _populate(Evas_Object *obj,
701static Eina_Bool 701static Eina_Bool
702_on_list_expanded(void *data, const Eo_Event *event) 702_on_list_expanded(void *data, const Eo_Event *event)
703{ 703{
704 Elm_Object_Item *it = event->event_info; 704 Elm_Object_Item *it = event->info;
705 const char *path = elm_object_item_data_get(it); 705 const char *path = elm_object_item_data_get(it);
706 706
707 _populate(data, path, it, NULL); 707 _populate(data, path, it, NULL);
@@ -712,7 +712,7 @@ _on_list_expanded(void *data, const Eo_Event *event)
712static Eina_Bool 712static Eina_Bool
713_on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event) 713_on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event)
714{ 714{
715 Elm_Object_Item *it = event->event_info; 715 Elm_Object_Item *it = event->info;
716 716
717 elm_genlist_item_subitems_clear(it); 717 elm_genlist_item_subitems_clear(it);
718 718
@@ -722,7 +722,7 @@ _on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event)
722static Eina_Bool 722static Eina_Bool
723_on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event) 723_on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event)
724{ 724{
725 Elm_Object_Item *it = event->event_info; 725 Elm_Object_Item *it = event->info;
726 726
727 elm_genlist_item_expanded_set(it, EINA_TRUE); 727 elm_genlist_item_expanded_set(it, EINA_TRUE);
728 728
@@ -732,7 +732,7 @@ _on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event)
732static Eina_Bool 732static Eina_Bool
733_on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event) 733_on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event)
734{ 734{
735 Elm_Object_Item *it = event->event_info; 735 Elm_Object_Item *it = event->info;
736 736
737 elm_genlist_item_expanded_set(it, EINA_FALSE); 737 elm_genlist_item_expanded_set(it, EINA_FALSE);
738 738
@@ -784,7 +784,7 @@ static Eina_Bool
784_on_item_activated(void *data, const Eo_Event *event) 784_on_item_activated(void *data, const Eo_Event *event)
785{ 785{
786 //This event_info could be a list or gengrid item 786 //This event_info could be a list or gengrid item
787 Elm_Object_Item *it = event->event_info; 787 Elm_Object_Item *it = event->info;
788 const char *path; 788 const char *path;
789 Eina_Bool is_dir; 789 Eina_Bool is_dir;
790 790
@@ -840,7 +840,7 @@ static Eina_Bool
840_on_item_selected(void *data, const Eo_Event *event) 840_on_item_selected(void *data, const Eo_Event *event)
841{ 841{
842 //This event_info could be a list or gengrid item 842 //This event_info could be a list or gengrid item
843 Elm_Object_Item *it = event->event_info; 843 Elm_Object_Item *it = event->info;
844 const char *path; 844 const char *path;
845 char *parent_path; 845 char *parent_path;
846 Eina_Bool is_dir; 846 Eina_Bool is_dir;
@@ -931,7 +931,7 @@ _on_item_unselected(void *data, const Eo_Event *event)
931 char *path; 931 char *path;
932 const char *unselected_path; 932 const char *unselected_path;
933 Eina_Strbuf *buf; 933 Eina_Strbuf *buf;
934 Elm_Object_Item *it = event->event_info; 934 Elm_Object_Item *it = event->info;
935 Eina_Bool first = EINA_TRUE; 935 Eina_Bool first = EINA_TRUE;
936 936
937 ELM_FILESELECTOR_DATA_GET(data, sd); 937 ELM_FILESELECTOR_DATA_GET(data, sd);
@@ -1175,7 +1175,7 @@ _on_text_unfocused(void *data, const Eo_Event *event EINA_UNUSED)
1175static Eina_Bool 1175static Eina_Bool
1176_anchor_clicked(void *data, const Eo_Event *event) 1176_anchor_clicked(void *data, const Eo_Event *event)
1177{ 1177{
1178 Elm_Entry_Anchor_Info *info = event->event_info; 1178 Elm_Entry_Anchor_Info *info = event->info;
1179 Evas_Object *fs = data; 1179 Evas_Object *fs = data;
1180 const char *p; 1180 const char *p;
1181 1181
@@ -1200,7 +1200,7 @@ _anchor_clicked(void *data, const Eo_Event *event)
1200static Eina_Bool 1200static Eina_Bool
1201_files_key_down(void *data, const Eo_Event *event) 1201_files_key_down(void *data, const Eo_Event *event)
1202{ 1202{
1203 Evas_Event_Key_Down *ev = event->event_info; 1203 Evas_Event_Key_Down *ev = event->info;
1204 Evas_Object *par, *searchbar; 1204 Evas_Object *par, *searchbar;
1205 1205
1206 par = data; 1206 par = data;
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 412aefdc69..75cee4d1d9 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -65,7 +65,7 @@ static Eina_Bool
65_selection_done(void *data, const Eo_Event *event) 65_selection_done(void *data, const Eo_Event *event)
66{ 66{
67 Elm_Fileselector_Button_Data *sd = data; 67 Elm_Fileselector_Button_Data *sd = data;
68 const char *file = event->event_info; 68 const char *file = event->info;
69 Evas_Object *del; 69 Evas_Object *del;
70 70
71 if (file) eina_stringshare_replace(&sd->fsd.path, file); 71 if (file) eina_stringshare_replace(&sd->fsd.path, file);
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 85bb72ea44..6296d35503 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -47,7 +47,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
47 static Eina_Bool \ 47 static Eina_Bool \
48 _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \ 48 _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \
49 { \ 49 { \
50 eo_event_callback_call(data, event, ev->event_info); \ 50 eo_event_callback_call(data, event, ev->info); \
51 \ 51 \
52 return EINA_TRUE; \ 52 return EINA_TRUE; \
53 } 53 }
@@ -67,7 +67,7 @@ SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED)
67static Eina_Bool 67static Eina_Bool
68_FILE_CHOSEN_fwd(void *data, const Eo_Event *event) 68_FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
69{ 69{
70 const char *file = event->event_info; 70 const char *file = event->info;
71 char *s; 71 char *s;
72 72
73 if (!file) return EINA_TRUE; 73 if (!file) return EINA_TRUE;
@@ -77,7 +77,7 @@ _FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
77 elm_object_text_set(sd->entry, s); 77 elm_object_text_set(sd->entry, s);
78 free(s); 78 free(s);
79 eo_event_callback_call 79 eo_event_callback_call
80 (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->event_info); 80 (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->info);
81 81
82 return EINA_TRUE; 82 return EINA_TRUE;
83} 83}
@@ -92,7 +92,7 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
92 file = elm_object_text_get(sd->entry); 92 file = elm_object_text_get(sd->entry);
93 elm_fileselector_path_set(sd->button, file); 93 elm_fileselector_path_set(sd->button, file);
94 eo_event_callback_call 94 eo_event_callback_call
95 (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->event_info); 95 (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->info);
96 96
97 return EINA_TRUE; 97 return EINA_TRUE;
98} 98}
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 3709b9c260..14f9a42a92 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -3801,7 +3801,7 @@ _handle_listener_change(void *data, const Eldbus_Message *msg EINA_UNUSED)
3801static Eina_Bool 3801static Eina_Bool
3802_state_changed_signal_send(void *data, const Eo_Event *event) 3802_state_changed_signal_send(void *data, const Eo_Event *event)
3803{ 3803{
3804 Elm_Atspi_Event_State_Changed_Data *state_data = event->event_info; 3804 Elm_Atspi_Event_State_Changed_Data *state_data = event->info;
3805 const char *type_desc; 3805 const char *type_desc;
3806 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3806 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE);
3807 3807
@@ -3822,7 +3822,7 @@ _state_changed_signal_send(void *data, const Eo_Event *event)
3822static Eina_Bool 3822static Eina_Bool
3823_property_changed_signal_send(void *data, const Eo_Event *event) 3823_property_changed_signal_send(void *data, const Eo_Event *event)
3824{ 3824{
3825 const char *property = event->event_info; 3825 const char *property = event->info;
3826 char *atspi_desc; 3826 char *atspi_desc;
3827 enum _Atspi_Object_Property prop = ATSPI_OBJECT_PROPERTY_LAST; 3827 enum _Atspi_Object_Property prop = ATSPI_OBJECT_PROPERTY_LAST;
3828 3828
@@ -3887,7 +3887,7 @@ _visible_data_changed_signal_send(void *data, const Eo_Event *event)
3887static Eina_Bool 3887static Eina_Bool
3888_active_descendant_changed_signal_send(void *data, const Eo_Event *event) 3888_active_descendant_changed_signal_send(void *data, const Eo_Event *event)
3889{ 3889{
3890 Eo *child = event->event_info; 3890 Eo *child = event->info;
3891 int idx; 3891 int idx;
3892 3892
3893 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3893 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE);
@@ -3907,7 +3907,7 @@ static Eina_Bool
3907_children_changed_signal_send(void *data, const Eo_Event *event) 3907_children_changed_signal_send(void *data, const Eo_Event *event)
3908{ 3908{
3909 const char *atspi_desc = NULL; 3909 const char *atspi_desc = NULL;
3910 Elm_Atspi_Event_Children_Changed_Data *ev_data = event->event_info; 3910 Elm_Atspi_Event_Children_Changed_Data *ev_data = event->info;
3911 int idx; 3911 int idx;
3912 enum _Atspi_Object_Child_Event_Type type; 3912 enum _Atspi_Object_Child_Event_Type type;
3913 3913
@@ -4094,7 +4094,7 @@ _text_caret_moved_send(void *data, const Eo_Event *event)
4094static Eina_Bool 4094static Eina_Bool
4095_text_text_inserted_send(void *data, const Eo_Event *event) 4095_text_text_inserted_send(void *data, const Eo_Event *event)
4096{ 4096{
4097 Elm_Atspi_Text_Change_Info *info = event->event_info; 4097 Elm_Atspi_Text_Change_Info *info = event->info;
4098 4098
4099 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4099 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
4100 4100
@@ -4110,7 +4110,7 @@ _text_text_inserted_send(void *data, const Eo_Event *event)
4110static Eina_Bool 4110static Eina_Bool
4111_text_text_removed_send(void *data, const Eo_Event *event) 4111_text_text_removed_send(void *data, const Eo_Event *event)
4112{ 4112{
4113 Elm_Atspi_Text_Change_Info *info = event->event_info; 4113 Elm_Atspi_Text_Change_Info *info = event->info;
4114 4114
4115 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4115 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE);
4116 4116
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 04231e1765..3bbf5c209a 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -32,7 +32,7 @@ static Eina_Bool
32_child_added_cb_proxy(void *data, const Eo_Event *event) 32_child_added_cb_proxy(void *data, const Eo_Event *event)
33{ 33{
34 Evas_Object *box = data; 34 Evas_Object *box = data;
35 Evas_Object_Box_Option *opt = event->event_info; 35 Evas_Object_Box_Option *opt = event->info;
36 eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj); 36 eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj);
37 37
38 return EINA_TRUE; 38 return EINA_TRUE;
@@ -42,7 +42,7 @@ static Eina_Bool
42_child_removed_cb_proxy(void *data, const Eo_Event *event) 42_child_removed_cb_proxy(void *data, const Eo_Event *event)
43{ 43{
44 Evas_Object *box = data; 44 Evas_Object *box = data;
45 Evas_Object *child = event->event_info; 45 Evas_Object *child = event->info;
46 eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child); 46 eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child);
47 47
48 return EINA_TRUE; 48 return EINA_TRUE;
@@ -196,7 +196,7 @@ static Eina_Bool
196_transition_layout_child_added(void *data, const Eo_Event *event) 196_transition_layout_child_added(void *data, const Eo_Event *event)
197{ 197{
198 Transition_Animation_Data *tad; 198 Transition_Animation_Data *tad;
199 Evas_Object_Box_Option *opt = event->event_info; 199 Evas_Object_Box_Option *opt = event->info;
200 Elm_Box_Transition *layout_data = data; 200 Elm_Box_Transition *layout_data = data;
201 201
202 tad = calloc(1, sizeof(Transition_Animation_Data)); 202 tad = calloc(1, sizeof(Transition_Animation_Data));
@@ -218,7 +218,7 @@ _transition_layout_child_removed(void *data, const Eo_Event *event)
218 218
219 EINA_LIST_FOREACH(layout_data->objs, l, tad) 219 EINA_LIST_FOREACH(layout_data->objs, l, tad)
220 { 220 {
221 if (tad->obj == event->event_info) 221 if (tad->obj == event->info)
222 { 222 {
223 free(eina_list_data_get(l)); 223 free(eina_list_data_get(l));
224 layout_data->objs = eina_list_remove_list(layout_data->objs, l); 224 layout_data->objs = eina_list_remove_list(layout_data->objs, l);
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index 856f59062b..41bd65ea0c 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -193,7 +193,7 @@ static Eina_Bool
193_colorclass_activate(void *data, const Eo_Event *event) 193_colorclass_activate(void *data, const Eo_Event *event)
194{ 194{
195 Colorclass_UI *cc = data; 195 Colorclass_UI *cc = data;
196 Elm_Object_Item *it = event->event_info; 196 Elm_Object_Item *it = event->info;
197 Edje_Color_Class *ecc; 197 Edje_Color_Class *ecc;
198 Colorclass *lcc; 198 Colorclass *lcc;
199 Eina_List *l; 199 Eina_List *l;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 42279fa09d..a081fc45cc 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3870,7 +3870,7 @@ elm_entry_add(Evas_Object *parent)
3870static Eina_Bool 3870static Eina_Bool
3871_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) 3871_cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
3872{ 3872{
3873 const Eo_Callback_Array_Item *event = ev->event_info; 3873 const Eo_Callback_Array_Item *event = ev->info;
3874 3874
3875 ELM_ENTRY_DATA_GET(ev->obj, sd); 3875 ELM_ENTRY_DATA_GET(ev->obj, sd);
3876 if (event->desc == ELM_ENTRY_EVENT_VALIDATE) 3876 if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
@@ -3881,7 +3881,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
3881static Eina_Bool 3881static Eina_Bool
3882_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) 3882_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
3883{ 3883{
3884 const Eo_Callback_Array_Item *event = ev->event_info; 3884 const Eo_Callback_Array_Item *event = ev->info;
3885 3885
3886 ELM_ENTRY_DATA_GET(ev->obj, sd); 3886 ELM_ENTRY_DATA_GET(ev->obj, sd);
3887 if (event->desc == ELM_ENTRY_EVENT_VALIDATE) 3887 if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index 80eeea7dad..9b1b3b038b 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -303,7 +303,7 @@ _elm_glview_evas_object_smart_del(Eo *obj, Elm_Glview_Data *sd)
303static Eina_Bool 303static Eina_Bool
304_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) 304_cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
305{ 305{
306 const Eo_Callback_Array_Item *event = ev->event_info; 306 const Eo_Callback_Array_Item *event = ev->info;
307 307
308 ELM_GLVIEW_DATA_GET(ev->obj, sd); 308 ELM_GLVIEW_DATA_GET(ev->obj, sd);
309 309
diff --git a/src/lib/elementary/elm_helper.c b/src/lib/elementary/elm_helper.c
index 4f5710af4a..ca8cd35285 100644
--- a/src/lib/elementary/elm_helper.c
+++ b/src/lib/elementary/elm_helper.c
@@ -41,7 +41,7 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator)
41EAPI Eina_Bool 41EAPI Eina_Bool
42elm_validator_regexp_helper(void *data, const Eo_Event *event) 42elm_validator_regexp_helper(void *data, const Eo_Event *event)
43{ 43{
44 Elm_Validate_Content *vc = event->event_info; 44 Elm_Validate_Content *vc = event->info;
45 Elm_Validator_Regexp *validator = (Elm_Validator_Regexp *)data; 45 Elm_Validator_Regexp *validator = (Elm_Validator_Regexp *)data;
46 46
47 validator->status = regexec(&validator->regex, vc->text, (size_t)0, NULL, 0) ? ELM_REG_NOMATCH : ELM_REG_NOERROR; 47 validator->status = regexec(&validator->regex, vc->text, (size_t)0, NULL, 0) ? ELM_REG_NOMATCH : ELM_REG_NOERROR;
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c
index 1e9d1a225e..75853fa348 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/elm_interface_atspi_accessible.c
@@ -346,7 +346,7 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
346 Eo_Event ev; 346 Eo_Event ev;
347 ev.obj = accessible; 347 ev.obj = accessible;
348 ev.desc = event; 348 ev.desc = event;
349 ev.event_info = event_info; 349 ev.info = event_info;
350 EINA_LIST_FOREACH(global_callbacks, l, hdl) 350 EINA_LIST_FOREACH(global_callbacks, l, hdl)
351 { 351 {
352 if (hdl->cb) 352 if (hdl->cb)
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index ee31bcc2d6..652f9b86d2 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -425,7 +425,7 @@ _menu_hide(void *data,
425static Eina_Bool 425static Eina_Bool
426_hover_dismissed_cb(void *data, const Eo_Event *event) 426_hover_dismissed_cb(void *data, const Eo_Event *event)
427{ 427{
428 _menu_hide(data, event->obj, event->event_info); 428 _menu_hide(data, event->obj, event->info);
429 eo_event_callback_call 429 eo_event_callback_call
430 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 430 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
431 eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL); 431 eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL);
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index b621476eb0..bca36b0b67 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -889,7 +889,7 @@ _text_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
889static Eina_Bool 889static Eina_Bool
890_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event) 890_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event)
891{ 891{
892 Evas_Event_Mouse_Move *ev = event->event_info; 892 Evas_Event_Mouse_Move *ev = event->info;
893 ELM_SPINNER_DATA_GET(data, sd); 893 ELM_SPINNER_DATA_GET(data, sd);
894 894
895 if ((ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) && sd->longpress_timer) 895 if ((ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) && sd->longpress_timer)
diff --git a/src/lib/elementary/elm_store.c b/src/lib/elementary/elm_store.c
index 422718dba3..a953f910c5 100644
--- a/src/lib/elementary/elm_store.c
+++ b/src/lib/elementary/elm_store.c
@@ -227,7 +227,7 @@ static Eina_Bool
227_store_genlist_item_realized(void *data, const Eo_Event *event) 227_store_genlist_item_realized(void *data, const Eo_Event *event)
228{ 228{
229 Elm_Store *st = data; 229 Elm_Store *st = data;
230 Elm_Object_Item *gli = event->event_info; 230 Elm_Object_Item *gli = event->info;
231 Elm_Store_Item *sti = elm_object_item_data_get(gli); 231 Elm_Store_Item *sti = elm_object_item_data_get(gli);
232 if (!sti) return EINA_TRUE; 232 if (!sti) return EINA_TRUE;
233 st->realized_count++; 233 st->realized_count++;
@@ -241,7 +241,7 @@ static Eina_Bool
241_store_genlist_item_unrealized(void *data, const Eo_Event *event) 241_store_genlist_item_unrealized(void *data, const Eo_Event *event)
242{ 242{
243 Elm_Store *st = data; 243 Elm_Store *st = data;
244 Elm_Object_Item *gli = event->event_info; 244 Elm_Object_Item *gli = event->info;
245 Elm_Store_Item *sti = elm_object_item_data_get(gli); 245 Elm_Store_Item *sti = elm_object_item_data_get(gli);
246 if (!sti) return EINA_TRUE; 246 if (!sti) return EINA_TRUE;
247 st->realized_count--; 247 st->realized_count--;
diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c
index 26c437e887..64023eb556 100644
--- a/src/lib/elementary/elm_view_form.c
+++ b/src/lib/elementary/elm_view_form.c
@@ -41,7 +41,7 @@ struct _Elm_View_Form_Data
41static Eina_Bool 41static Eina_Bool
42_efl_model_properties_change_cb(void *data, const Eo_Event *event) 42_efl_model_properties_change_cb(void *data, const Eo_Event *event)
43{ 43{
44 const Efl_Model_Property_Event *evt = event->event_info; 44 const Efl_Model_Property_Event *evt = event->info;
45 const Eina_Value *value; 45 const Eina_Value *value;
46 const char *prop; 46 const char *prop;
47 unsigned int i; 47 unsigned int i;
diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c
index dc03f2bd22..5a343763ee 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -160,7 +160,7 @@ _item_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part)
160static Eina_Bool 160static Eina_Bool
161_expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event) 161_expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
162{ 162{
163 Elm_Object_Item *item = event->event_info; 163 Elm_Object_Item *item = event->info;
164 View_List_ItemData *idata = elm_object_item_data_get(item); 164 View_List_ItemData *idata = elm_object_item_data_get(item);
165 Efl_Model_Load_Status st = EFL_MODEL_LOAD_STATUS_ERROR; 165 Efl_Model_Load_Status st = EFL_MODEL_LOAD_STATUS_ERROR;
166 166
@@ -183,7 +183,7 @@ _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
183static Eina_Bool 183static Eina_Bool
184_contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event) 184_contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
185{ 185{
186 Elm_Object_Item *item = event->event_info; 186 Elm_Object_Item *item = event->info;
187 View_List_ItemData *idata = elm_object_item_data_get(item); 187 View_List_ItemData *idata = elm_object_item_data_get(item);
188 188
189 eo_event_callback_array_del(idata->model, model_callbacks(), idata); 189 eo_event_callback_array_del(idata->model, model_callbacks(), idata);
@@ -194,7 +194,7 @@ _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
194static Eina_Bool 194static Eina_Bool
195_contracted_cb(void *data EINA_UNUSED, const Eo_Event *event) 195_contracted_cb(void *data EINA_UNUSED, const Eo_Event *event)
196{ 196{
197 Elm_Object_Item *glit = event->event_info; 197 Elm_Object_Item *glit = event->info;
198 elm_genlist_item_subitems_clear(glit); 198 elm_genlist_item_subitems_clear(glit);
199 return EINA_TRUE; 199 return EINA_TRUE;
200} 200}
@@ -218,7 +218,7 @@ static Eina_Bool
218_efl_model_properties_change_cb(void *data, const Eo_Event *event) 218_efl_model_properties_change_cb(void *data, const Eo_Event *event)
219{ 219{
220 View_List_ItemData *idata = data; 220 View_List_ItemData *idata = data;
221 Efl_Model_Property_Event *evt = event->event_info; 221 Efl_Model_Property_Event *evt = event->info;
222 222
223 EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_TRUE); 223 EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_TRUE);
224 EINA_SAFETY_ON_NULL_RETURN_VAL(evt, EINA_TRUE); 224 EINA_SAFETY_ON_NULL_RETURN_VAL(evt, EINA_TRUE);
@@ -285,7 +285,7 @@ static Eina_Bool
285_efl_model_load_status_change_cb(void *data, const Eo_Event *event) 285_efl_model_load_status_change_cb(void *data, const Eo_Event *event)
286{ 286{
287 View_List_ItemData *idata = data; 287 View_List_ItemData *idata = data;
288 Efl_Model_Load *load = event->event_info; 288 Efl_Model_Load *load = event->info;
289 289
290 if (load->status & EFL_MODEL_LOAD_STATUS_UNLOADED) 290 if (load->status & EFL_MODEL_LOAD_STATUS_UNLOADED)
291 { 291 {
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index e165af9178..1746844434 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -706,26 +706,26 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
706 706
707 if (event->desc == EVAS_OBJECT_EVENT_KEY_DOWN) 707 if (event->desc == EVAS_OBJECT_EVENT_KEY_DOWN)
708 { 708 {
709 Evas_Event_Key_Down *ev = event->event_info; 709 Evas_Event_Key_Down *ev = event->info;
710 event_flags = &(ev->event_flags); 710 event_flags = &(ev->event_flags);
711 type = EVAS_CALLBACK_KEY_DOWN; 711 type = EVAS_CALLBACK_KEY_DOWN;
712 } 712 }
713 else if (event->desc == EVAS_OBJECT_EVENT_KEY_UP) 713 else if (event->desc == EVAS_OBJECT_EVENT_KEY_UP)
714 { 714 {
715 Evas_Event_Key_Up *ev = event->event_info; 715 Evas_Event_Key_Up *ev = event->info;
716 event_flags = &(ev->event_flags); 716 event_flags = &(ev->event_flags);
717 type = EVAS_CALLBACK_KEY_UP; 717 type = EVAS_CALLBACK_KEY_UP;
718 } 718 }
719 else if (event->desc == EVAS_OBJECT_EVENT_MOUSE_WHEEL) 719 else if (event->desc == EVAS_OBJECT_EVENT_MOUSE_WHEEL)
720 { 720 {
721 Evas_Event_Mouse_Wheel *ev = event->event_info; 721 Evas_Event_Mouse_Wheel *ev = event->info;
722 event_flags = &(ev->event_flags); 722 event_flags = &(ev->event_flags);
723 type = EVAS_CALLBACK_MOUSE_WHEEL; 723 type = EVAS_CALLBACK_MOUSE_WHEEL;
724 } 724 }
725 else 725 else
726 return EO_CALLBACK_CONTINUE; 726 return EO_CALLBACK_CONTINUE;
727 727
728 elm_widget_event_propagate(obj, type, event->event_info, event_flags); 728 elm_widget_event_propagate(obj, type, event->info, event_flags);
729 729
730 return EO_CALLBACK_CONTINUE; 730 return EO_CALLBACK_CONTINUE;
731} 731}