summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/benchmarks/eo/eo_bench_callbacks.c2
-rw-r--r--src/bin/elementary/test_events.c10
-rw-r--r--src/lib/ecore/ecore_exe_posix.c2
-rw-r--r--src/lib/ecore/ecore_exe_win32.c4
-rw-r--r--src/lib/ecore/ecore_idle_enterer.c2
-rw-r--r--src/lib/ecore/ecore_idle_exiter.c2
-rw-r--r--src/lib/ecore/ecore_idler.c2
-rw-r--r--src/lib/ecore/ecore_main.c2
-rw-r--r--src/lib/ecore/ecore_timer.c2
-rw-r--r--src/lib/ecore/efl_io_closer_fd.c2
-rw-r--r--src/lib/ecore/efl_io_copier.c24
-rw-r--r--src/lib/ecore/efl_io_file.c2
-rw-r--r--src/lib/ecore/efl_io_positioner_fd.c2
-rw-r--r--src/lib/ecore/efl_io_reader_fd.c4
-rw-r--r--src/lib/ecore/efl_io_sizer_fd.c2
-rw-r--r--src/lib/ecore/efl_io_writer_fd.c2
-rw-r--r--src/lib/ecore/efl_loop_fd.c6
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c6
-rw-r--r--src/lib/ecore_con/ecore_con.c12
-rw-r--r--src/lib/ecore_con/ecore_con_url.c6
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c20
-rw-r--r--src/lib/ecore_con/efl_net_dialer_tcp.c4
-rw-r--r--src/lib/ecore_con/efl_net_server_fd.c6
-rw-r--r--src/lib/ecore_con/efl_net_server_tcp.c6
-rw-r--r--src/lib/ecore_evas/ecore_evas.c16
-rw-r--r--src/lib/ector/software/ector_software_buffer.c2
-rw-r--r--src/lib/edje/edje_calc.c2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_shape.c32
-rw-r--r--src/lib/efl/interfaces/efl_io_buffer.c28
-rw-r--r--src/lib/efl/interfaces/efl_io_queue.c16
-rw-r--r--src/lib/efl/interfaces/efl_model_common.c4
-rw-r--r--src/lib/efl/interfaces/efl_vpath_file.c6
-rw-r--r--src/lib/eio/efl_io_manager.c4
-rw-r--r--src/lib/eio/eio_model.c6
-rw-r--r--src/lib/eio/eio_sentry.c2
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.c2
-rw-r--r--src/lib/eldbus/eldbus_model_connection.c2
-rw-r--r--src/lib/eldbus/eldbus_model_method.c2
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c4
-rw-r--r--src/lib/elementary/efl_ui_box.c6
-rw-r--r--src/lib/elementary/efl_ui_flip.c8
-rw-r--r--src/lib/elementary/efl_ui_frame.c4
-rw-r--r--src/lib/elementary/efl_ui_grid.c6
-rw-r--r--src/lib/elementary/efl_ui_image.c22
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c10
-rw-r--r--src/lib/elementary/efl_ui_nstate.c2
-rw-r--r--src/lib/elementary/efl_ui_text.c66
-rw-r--r--src/lib/elementary/efl_ui_win.c72
-rw-r--r--src/lib/elementary/elc_combobox.c16
-rw-r--r--src/lib/elementary/elc_ctxpopup.c6
-rw-r--r--src/lib/elementary/elc_fileselector.c24
-rw-r--r--src/lib/elementary/elc_fileselector_button.c2
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c6
-rw-r--r--src/lib/elementary/elc_hoversel.c10
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c26
-rw-r--r--src/lib/elementary/elc_naviframe.c8
-rw-r--r--src/lib/elementary/elc_player.c22
-rw-r--r--src/lib/elementary/elc_popup.c12
-rw-r--r--src/lib/elementary/elm_actionslider.c32
-rw-r--r--src/lib/elementary/elm_app_client.c10
-rw-r--r--src/lib/elementary/elm_app_client_view.c18
-rw-r--r--src/lib/elementary/elm_app_server.c4
-rw-r--r--src/lib/elementary/elm_app_server_view.c14
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c4
-rw-r--r--src/lib/elementary/elm_box.c4
-rw-r--r--src/lib/elementary/elm_bubble.c2
-rw-r--r--src/lib/elementary/elm_button.c10
-rw-r--r--src/lib/elementary/elm_calendar.c6
-rw-r--r--src/lib/elementary/elm_check.c6
-rw-r--r--src/lib/elementary/elm_clock.c4
-rw-r--r--src/lib/elementary/elm_code.c2
-rw-r--r--src/lib/elementary/elm_code_widget.c18
-rw-r--r--src/lib/elementary/elm_code_widget_selection.c8
-rw-r--r--src/lib/elementary/elm_colorselector.c16
-rw-r--r--src/lib/elementary/elm_conform.c8
-rw-r--r--src/lib/elementary/elm_datetime.c8
-rw-r--r--src/lib/elementary/elm_dayselector.c2
-rw-r--r--src/lib/elementary/elm_diskselector.c12
-rw-r--r--src/lib/elementary/elm_entry.c84
-rw-r--r--src/lib/elementary/elm_flipselector.c6
-rw-r--r--src/lib/elementary/elm_gengrid.c82
-rw-r--r--src/lib/elementary/elm_genlist.c128
-rw-r--r--src/lib/elementary/elm_glview.c8
-rw-r--r--src/lib/elementary/elm_hover.c14
-rw-r--r--src/lib/elementary/elm_icon.c6
-rw-r--r--src/lib/elementary/elm_index.c18
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c10
-rw-r--r--src/lib/elementary/elm_label.c2
-rw-r--r--src/lib/elementary/elm_layout.c6
-rw-r--r--src/lib/elementary/elm_list.c32
-rw-r--r--src/lib/elementary/elm_map.c56
-rw-r--r--src/lib/elementary/elm_menu.c4
-rw-r--r--src/lib/elementary/elm_notify.c6
-rw-r--r--src/lib/elementary/elm_panel.c8
-rw-r--r--src/lib/elementary/elm_panes.c8
-rw-r--r--src/lib/elementary/elm_photo.c6
-rw-r--r--src/lib/elementary/elm_photocam.c56
-rw-r--r--src/lib/elementary/elm_plug.c6
-rw-r--r--src/lib/elementary/elm_prefs.c12
-rw-r--r--src/lib/elementary/elm_progressbar.c2
-rw-r--r--src/lib/elementary/elm_radio.c2
-rw-r--r--src/lib/elementary/elm_scroller.c40
-rw-r--r--src/lib/elementary/elm_segment_control.c2
-rw-r--r--src/lib/elementary/elm_slider.c20
-rw-r--r--src/lib/elementary/elm_slideshow.c8
-rw-r--r--src/lib/elementary/elm_spinner.c10
-rw-r--r--src/lib/elementary/elm_thumb.c18
-rw-r--r--src/lib/elementary/elm_toolbar.c24
-rw-r--r--src/lib/elementary/elm_view_list.c2
-rw-r--r--src/lib/elementary/elm_widget.c6
-rw-r--r--src/lib/emotion/emotion_smart.c46
-rw-r--r--src/lib/eo/efl_object.eo16
-rw-r--r--src/lib/eo/eo_base_class.c31
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c6
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c6
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.c4
-rw-r--r--src/lib/evas/canvas/evas_object_box.c16
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c2
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c44
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h2
-rw-r--r--src/modules/emotion/libvlc/emotion_libvlc.c2
-rw-r--r--src/tests/eo/access/access_simple.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c2
-rw-r--r--src/tests/eo/signals/signals_main.c4
-rw-r--r--src/tests/eo/signals/signals_simple.c2
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c2
-rw-r--r--src/tests/eo/suite/eo_test_general.c6
-rw-r--r--src/tests/eolian_cxx/generic.c10
-rw-r--r--src/tests/eolian_js/eolian_js_test_test_object_impl.c6
131 files changed, 860 insertions, 827 deletions
diff --git a/src/benchmarks/eo/eo_bench_callbacks.c b/src/benchmarks/eo/eo_bench_callbacks.c
index 4c8a9f38c2..1846a707c8 100644
--- a/src/benchmarks/eo/eo_bench_callbacks.c
+++ b/src/benchmarks/eo/eo_bench_callbacks.c
@@ -65,7 +65,7 @@ bench_eo_callbacks_call(int request)
65 for (j = 0 ; j < (int) (distribution[i] * request) ; j++) 65 for (j = 0 ; j < (int) (distribution[i] * request) ; j++)
66 { 66 {
67 /* Miss finding the callbacks on purpose, so we measure worst case scenario. */ 67 /* Miss finding the callbacks on purpose, so we measure worst case scenario. */
68 efl_event_callback_call(obj[i], SIMPLE_BAR, NULL); 68 efl_event_callback_legacy_call(obj[i], SIMPLE_BAR, NULL);
69 } 69 }
70 } 70 }
71 71
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 60bd7f8a3b..45ba43298d 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -144,14 +144,14 @@ _clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED)
144 efl_input_pointer_position_set(td->evdown, x, y); 144 efl_input_pointer_position_set(td->evdown, x, y);
145 efl_input_pointer_position_set(td->evup, x, y); 145 efl_input_pointer_position_set(td->evup, x, y);
146 146
147 efl_event_callback_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove); 147 efl_event_callback_legacy_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove);
148 efl_event_callback_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown); 148 efl_event_callback_legacy_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown);
149 efl_event_callback_call(td->win, EFL_EVENT_POINTER_UP, td->evup); 149 efl_event_callback_legacy_call(td->win, EFL_EVENT_POINTER_UP, td->evup);
150 } 150 }
151 else 151 else
152 { 152 {
153 efl_event_callback_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown); 153 efl_event_callback_legacy_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown);
154 efl_event_callback_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup); 154 efl_event_callback_legacy_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup);
155 efl_del(td->evkeydown); 155 efl_del(td->evkeydown);
156 efl_del(td->evkeyup); 156 efl_del(td->evkeyup);
157 td->evkeydown = NULL; 157 td->evkeydown = NULL;
diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c
index 5ad60f9010..49a98f675e 100644
--- a/src/lib/ecore/ecore_exe_posix.c
+++ b/src/lib/ecore/ecore_exe_posix.c
@@ -1167,7 +1167,7 @@ _ecore_exe_data_generic_handler(void *data,
1167 ecore_event_add(event_type, e, 1167 ecore_event_add(event_type, e,
1168 _ecore_exe_event_exe_data_free, 1168 _ecore_exe_event_exe_data_free,
1169 NULL); 1169 NULL);
1170 efl_event_callback_call(obj, eo_event, e); 1170 efl_event_callback_legacy_call(obj, eo_event, e);
1171 } 1171 }
1172 } 1172 }
1173 } 1173 }
diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c
index e2ef5ac94e..44ee08f39e 100644
--- a/src/lib/ecore/ecore_exe_win32.c
+++ b/src/lib/ecore/ecore_exe_win32.c
@@ -158,7 +158,7 @@ _ecore_exe_pipe_read_thread_cb(void *data)
158 ecore_event_add(ECORE_EXE_EVENT_DATA, event_data, 158 ecore_event_add(ECORE_EXE_EVENT_DATA, event_data,
159 _ecore_exe_event_exe_data_free, 159 _ecore_exe_event_exe_data_free,
160 NULL); 160 NULL);
161 efl_event_callback_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data); 161 efl_event_callback_legacy_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data);
162 } 162 }
163 163
164 current_buf = NULL; 164 current_buf = NULL;
@@ -228,7 +228,7 @@ _ecore_exe_pipe_error_thread_cb(void *data)
228 ecore_event_add(ECORE_EXE_EVENT_ERROR, event_data, 228 ecore_event_add(ECORE_EXE_EVENT_ERROR, event_data,
229 _ecore_exe_event_exe_data_free, 229 _ecore_exe_event_exe_data_free,
230 NULL); 230 NULL);
231 efl_event_callback_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data); 231 efl_event_callback_legacy_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data);
232 } 232 }
233 233
234 current_buf = NULL; 234 current_buf = NULL;
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index 08e7d9d95a..8ce3c6a4fe 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -45,5 +45,5 @@ ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
45void 45void
46_ecore_idle_enterer_call(Eo *loop) 46_ecore_idle_enterer_call(Eo *loop)
47{ 47{
48 efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL); 48 efl_event_callback_legacy_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL);
49} 49}
diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index 8295af24f8..9eb0523857 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -29,5 +29,5 @@ ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
29void 29void
30_ecore_idle_exiter_call(Eo *loop) 30_ecore_idle_exiter_call(Eo *loop)
31{ 31{
32 efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL); 32 efl_event_callback_legacy_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
33} 33}
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index e116852853..69c62071a6 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -116,7 +116,7 @@ ecore_idler_del(Ecore_Idler *idler)
116void 116void
117_ecore_idler_all_call(Eo *loop) 117_ecore_idler_all_call(Eo *loop)
118{ 118{
119 efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE, NULL); 119 efl_event_callback_legacy_call(loop, EFL_LOOP_EVENT_IDLE, NULL);
120} 120}
121 121
122int 122int
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 5e941ed3d7..7d0c5d1a5c 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2873,7 +2873,7 @@ _efl_loop_arguments_send(void *data, void *value EINA_UNUSED)
2873 arge.initialization = initialization; 2873 arge.initialization = initialization;
2874 initialization = EINA_FALSE; 2874 initialization = EINA_FALSE;
2875 2875
2876 efl_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge); 2876 efl_event_callback_legacy_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge);
2877 2877
2878 _efl_loop_arguments_cleanup(arga); 2878 _efl_loop_arguments_cleanup(arga);
2879} 2879}
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 9998ff3126..67cd247736 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -658,7 +658,7 @@ _efl_loop_timer_expired_call(double when)
658 658
659 efl_ref(timer->object); 659 efl_ref(timer->object);
660 eina_evlog("+timer", timer, 0.0, NULL); 660 eina_evlog("+timer", timer, 0.0, NULL);
661 efl_event_callback_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL); 661 efl_event_callback_legacy_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL);
662 eina_evlog("-timer", timer, 0.0, NULL); 662 eina_evlog("-timer", timer, 0.0, NULL);
663 663
664 /* may have changed in recursive main loops */ 664 /* may have changed in recursive main loops */
diff --git a/src/lib/ecore/efl_io_closer_fd.c b/src/lib/ecore/efl_io_closer_fd.c
index a0ad5eca2d..ba648e28b0 100644
--- a/src/lib/ecore/efl_io_closer_fd.c
+++ b/src/lib/ecore/efl_io_closer_fd.c
@@ -36,7 +36,7 @@ _efl_io_closer_fd_efl_io_closer_close(Eo *o, Efl_Io_Closer_Fd_Data *pd EINA_UNUS
36 36
37 efl_io_closer_fd_closer_fd_set(o, -1); 37 efl_io_closer_fd_closer_fd_set(o, -1);
38 if (close(fd) < 0) err = errno; 38 if (close(fd) < 0) err = errno;
39 efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); 39 efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
40 return err; 40 return err;
41} 41}
42 42
diff --git a/src/lib/ecore/efl_io_copier.c b/src/lib/ecore/efl_io_copier.c
index 029c49411c..b75182b2bf 100644
--- a/src/lib/ecore/efl_io_copier.c
+++ b/src/lib/ecore/efl_io_copier.c
@@ -81,7 +81,7 @@ _efl_io_copier_job(void *data, void *value EINA_UNUSED)
81 if (pd->destination && efl_io_writer_can_write_get(pd->destination)) 81 if (pd->destination && efl_io_writer_can_write_get(pd->destination))
82 _efl_io_copier_write(o, pd); 82 _efl_io_copier_write(o, pd);
83 83
84 efl_event_callback_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL); 84 efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL);
85 85
86 if (!pd->source || efl_io_reader_eos_get(pd->source)) 86 if (!pd->source || efl_io_reader_eos_get(pd->source))
87 { 87 {
@@ -89,7 +89,7 @@ _efl_io_copier_job(void *data, void *value EINA_UNUSED)
89 ((!pd->destination) || (eina_binbuf_length_get(pd->buf) == 0))) 89 ((!pd->destination) || (eina_binbuf_length_get(pd->buf) == 0)))
90 { 90 {
91 pd->done = EINA_TRUE; 91 pd->done = EINA_TRUE;
92 efl_event_callback_call(o, EFL_IO_COPIER_EVENT_DONE, NULL); 92 efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_DONE, NULL);
93 } 93 }
94 } 94 }
95} 95}
@@ -125,7 +125,7 @@ _efl_io_copier_dispatch_data_events(Eo *o, Efl_Io_Copier_Data *pd, Eina_Slice sl
125 125
126 offset = slice_of_binbuf.bytes - tmp.bytes; 126 offset = slice_of_binbuf.bytes - tmp.bytes;
127 127
128 efl_event_callback_call(o, EFL_IO_COPIER_EVENT_DATA, &slice_of_binbuf); 128 efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_DATA, &slice_of_binbuf);
129 /* user may have modified pd->buf, like calling 129 /* user may have modified pd->buf, like calling
130 * efl_io_copier_buffer_limit_set() 130 * efl_io_copier_buffer_limit_set()
131 */ 131 */
@@ -141,7 +141,7 @@ _efl_io_copier_dispatch_data_events(Eo *o, Efl_Io_Copier_Data *pd, Eina_Slice sl
141 141
142 if (pd->line_delimiter.len > 0) 142 if (pd->line_delimiter.len > 0)
143 { 143 {
144 efl_event_callback_call(o, EFL_IO_COPIER_EVENT_LINE, &slice_of_binbuf); 144 efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_LINE, &slice_of_binbuf);
145 /* user may have modified pd->buf, like calling 145 /* user may have modified pd->buf, like calling
146 * efl_io_copier_buffer_limit_set() 146 * efl_io_copier_buffer_limit_set()
147 */ 147 */
@@ -191,7 +191,7 @@ _efl_io_copier_read(Eo *o, Efl_Io_Copier_Data *pd)
191 err = efl_io_reader_read(pd->source, &rw_slice); 191 err = efl_io_reader_read(pd->source, &rw_slice);
192 if (err) 192 if (err)
193 { 193 {
194 efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); 194 efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
195 return; 195 return;
196 } 196 }
197 197
@@ -199,7 +199,7 @@ _efl_io_copier_read(Eo *o, Efl_Io_Copier_Data *pd)
199 if (!eina_binbuf_append_slice(pd->buf, ro_slice)) 199 if (!eina_binbuf_append_slice(pd->buf, ro_slice))
200 { 200 {
201 err = ENOMEM; 201 err = ENOMEM;
202 efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); 202 efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
203 return; 203 return;
204 } 204 }
205 205
@@ -262,7 +262,7 @@ _efl_io_copier_write(Eo *o, Efl_Io_Copier_Data *pd)
262 if (err) 262 if (err)
263 { 263 {
264 if (err != EAGAIN) 264 if (err != EAGAIN)
265 efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); 265 efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
266 return; 266 return;
267 } 267 }
268 pd->progress.written += ro_slice.len; 268 pd->progress.written += ro_slice.len;
@@ -277,7 +277,7 @@ _efl_io_copier_write(Eo *o, Efl_Io_Copier_Data *pd)
277 if (!eina_binbuf_remove(pd->buf, 0, ro_slice.len)) 277 if (!eina_binbuf_remove(pd->buf, 0, ro_slice.len))
278 { 278 {
279 err = ENOMEM; 279 err = ENOMEM;
280 efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); 280 efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
281 return; 281 return;
282 } 282 }
283 283
@@ -320,7 +320,7 @@ _efl_io_copier_source_size_apply(Eo *o, Efl_Io_Copier_Data *pd)
320 if (pd->destination && efl_isa(pd->destination, EFL_IO_SIZER_MIXIN)) 320 if (pd->destination && efl_isa(pd->destination, EFL_IO_SIZER_MIXIN))
321 efl_io_sizer_resize(pd->destination, pd->progress.total); 321 efl_io_sizer_resize(pd->destination, pd->progress.total);
322 322
323 efl_event_callback_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL); 323 efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL);
324} 324}
325 325
326static void 326static void
@@ -424,13 +424,13 @@ _efl_io_copier_destination_closed(void *data, const Eo_Event *event EINA_UNUSED)
424 if (!pd->done) 424 if (!pd->done)
425 { 425 {
426 pd->done = EINA_TRUE; 426 pd->done = EINA_TRUE;
427 efl_event_callback_call(o, EFL_IO_COPIER_EVENT_DONE, NULL); 427 efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_DONE, NULL);
428 } 428 }
429 } 429 }
430 else 430 else
431 { 431 {
432 Eina_Error err = EBADF; 432 Eina_Error err = EBADF;
433 efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); 433 efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
434 } 434 }
435} 435}
436 436
@@ -601,7 +601,7 @@ _efl_io_copier_efl_io_closer_close(Eo *o, Efl_Io_Copier_Data *pd)
601 } 601 }
602 602
603 pd->closed = EINA_TRUE; 603 pd->closed = EINA_TRUE;
604 efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); 604 efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
605 605
606 if (pd->buf) 606 if (pd->buf)
607 { 607 {
diff --git a/src/lib/ecore/efl_io_file.c b/src/lib/ecore/efl_io_file.c
index 40c0346f01..cc5edc9e25 100644
--- a/src/lib/ecore/efl_io_file.c
+++ b/src/lib/ecore/efl_io_file.c
@@ -46,7 +46,7 @@ _efl_io_file_state_update(Eo *o, Efl_Io_File_Data *pd)
46 if (pd->last_position != pos) 46 if (pd->last_position != pos)
47 { 47 {
48 pd->last_position = pos; 48 pd->last_position = pos;
49 efl_event_callback_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); 49 efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
50 } 50 }
51} 51}
52 52
diff --git a/src/lib/ecore/efl_io_positioner_fd.c b/src/lib/ecore/efl_io_positioner_fd.c
index a1df02f107..574e7faefa 100644
--- a/src/lib/ecore/efl_io_positioner_fd.c
+++ b/src/lib/ecore/efl_io_positioner_fd.c
@@ -44,7 +44,7 @@ _efl_io_positioner_fd_efl_io_positioner_seek(Eo *o, Efl_Io_Positioner_Fd_Data *p
44 int fd = efl_io_positioner_fd_positioner_fd_get(o); 44 int fd = efl_io_positioner_fd_positioner_fd_get(o);
45 if (lseek(fd, (off_t)offset, _efl_io_positioner_whence_convert(whence)) < 0) 45 if (lseek(fd, (off_t)offset, _efl_io_positioner_whence_convert(whence)) < 0)
46 return errno; 46 return errno;
47 efl_event_callback_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); 47 efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
48 return 0; 48 return 0;
49} 49}
50 50
diff --git a/src/lib/ecore/efl_io_reader_fd.c b/src/lib/ecore/efl_io_reader_fd.c
index b5a94275c4..8a5ca4ffb3 100644
--- a/src/lib/ecore/efl_io_reader_fd.c
+++ b/src/lib/ecore/efl_io_reader_fd.c
@@ -78,7 +78,7 @@ _efl_io_reader_fd_efl_io_reader_can_read_set(Eo *o, Efl_Io_Reader_Fd_Data *pd, E
78 EINA_SAFETY_ON_TRUE_RETURN(efl_io_reader_fd_reader_fd_get(o) < 0); 78 EINA_SAFETY_ON_TRUE_RETURN(efl_io_reader_fd_reader_fd_get(o) < 0);
79 if (pd->can_read == can_read) return; 79 if (pd->can_read == can_read) return;
80 pd->can_read = can_read; 80 pd->can_read = can_read;
81 efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); 81 efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
82} 82}
83 83
84EOLIAN static Eina_Bool 84EOLIAN static Eina_Bool
@@ -94,7 +94,7 @@ _efl_io_reader_fd_efl_io_reader_eos_set(Eo *o, Efl_Io_Reader_Fd_Data *pd, Eina_B
94 if (pd->eos == is_eos) return; 94 if (pd->eos == is_eos) return;
95 pd->eos = is_eos; 95 pd->eos = is_eos;
96 if (is_eos) 96 if (is_eos)
97 efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL); 97 efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL);
98} 98}
99 99
100#include "efl_io_reader_fd.eo.c" 100#include "efl_io_reader_fd.eo.c"
diff --git a/src/lib/ecore/efl_io_sizer_fd.c b/src/lib/ecore/efl_io_sizer_fd.c
index a57d1a9496..9e9326a612 100644
--- a/src/lib/ecore/efl_io_sizer_fd.c
+++ b/src/lib/ecore/efl_io_sizer_fd.c
@@ -31,7 +31,7 @@ _efl_io_sizer_fd_efl_io_sizer_resize(Eo *o, Efl_Io_Sizer_Fd_Data *pd EINA_UNUSED
31{ 31{
32 int fd = efl_io_sizer_fd_sizer_fd_get(o); 32 int fd = efl_io_sizer_fd_sizer_fd_get(o);
33 if (ftruncate(fd, size) < 0) return errno; 33 if (ftruncate(fd, size) < 0) return errno;
34 efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); 34 efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
35 return 0; 35 return 0;
36} 36}
37 37
diff --git a/src/lib/ecore/efl_io_writer_fd.c b/src/lib/ecore/efl_io_writer_fd.c
index dac739b116..9e1b291b92 100644
--- a/src/lib/ecore/efl_io_writer_fd.c
+++ b/src/lib/ecore/efl_io_writer_fd.c
@@ -82,7 +82,7 @@ _efl_io_writer_fd_efl_io_writer_can_write_set(Eo *o, Efl_Io_Writer_Fd_Data *pd,
82 EINA_SAFETY_ON_TRUE_RETURN(efl_io_writer_fd_writer_fd_get(o) < 0); 82 EINA_SAFETY_ON_TRUE_RETURN(efl_io_writer_fd_writer_fd_get(o) < 0);
83 if (pd->can_write == can_write) return; 83 if (pd->can_write == can_write) return;
84 pd->can_write = can_write; 84 pd->can_write = can_write;
85 efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); 85 efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
86} 86}
87 87
88#include "efl_io_writer_fd.eo.c" 88#include "efl_io_writer_fd.eo.c"
diff --git a/src/lib/ecore/efl_loop_fd.c b/src/lib/ecore/efl_loop_fd.c
index 672dc187fe..9c9f7a56f9 100644
--- a/src/lib/ecore/efl_loop_fd.c
+++ b/src/lib/ecore/efl_loop_fd.c
@@ -31,15 +31,15 @@ _efl_loop_fd_read_cb(void *data, Ecore_Fd_Handler *fd_handler)
31 31
32 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ)) 32 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
33 { 33 {
34 efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_READ, NULL); 34 efl_event_callback_legacy_call(obj, EFL_LOOP_FD_EVENT_READ, NULL);
35 } 35 }
36 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE)) 36 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
37 { 37 {
38 efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL); 38 efl_event_callback_legacy_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL);
39 } 39 }
40 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR)) 40 if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR))
41 { 41 {
42 efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL); 42 efl_event_callback_legacy_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL);
43 } 43 }
44 44
45 return ECORE_CALLBACK_RENEW; 45 return ECORE_CALLBACK_RENEW;
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c
index ff8bd5b900..c4af7c42cb 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -27,7 +27,7 @@ _ecore_audio_in_speed_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, double
27 27
28 obj->speed = speed; 28 obj->speed = speed;
29 29
30 efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); 30 efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
31} 31}
32 32
33EOLIAN static double 33EOLIAN static double
@@ -41,7 +41,7 @@ _ecore_audio_in_samplerate_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, i
41{ 41{
42 obj->samplerate = samplerate; 42 obj->samplerate = samplerate;
43 43
44 efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); 44 efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
45} 45}
46 46
47EOLIAN static int 47EOLIAN static int
@@ -107,11 +107,11 @@ _ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len)
107 len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len); 107 len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len);
108 if (len_read == 0) { 108 if (len_read == 0) {
109 if (!obj->looped || !obj->seekable) { 109 if (!obj->looped || !obj->seekable) {
110 efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL); 110 efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL);
111 } else { 111 } else {
112 ecore_audio_obj_in_seek(eo_obj, 0, SEEK_SET); 112 ecore_audio_obj_in_seek(eo_obj, 0, SEEK_SET);
113 len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len); 113 len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len);
114 efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL); 114 efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL);
115 } 115 }
116 } 116 }
117 117
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
index 5adef64a67..58130b273e 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -220,12 +220,12 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
220 if (state == PA_CONTEXT_READY) { 220 if (state == PA_CONTEXT_READY) {
221 DBG("PA context ready."); 221 DBG("PA context ready.");
222 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 222 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
223 efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL); 223 efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL);
224 } 224 }
225 } else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) { 225 } else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) {
226 DBG("PA context fail."); 226 DBG("PA context fail.");
227 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 227 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
228 efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); 228 efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
229 } 229 }
230 } else { 230 } else {
231 DBG("Connection state %i", state); 231 DBG("Connection state %i", state);
@@ -251,7 +251,7 @@ static void _state_job(void *data EINA_UNUSED)
251 } 251 }
252 // the callback here can delete things in the list.. 252 // the callback here can delete things in the list..
253 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) { 253 EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
254 efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); 254 efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
255 } 255 }
256 // now unref everything safely 256 // now unref everything safely
257 EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) { 257 EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 8340c3d463..f6369e532c 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -1053,7 +1053,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
1053 if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE; 1053 if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE;
1054 ecore_event_add(ev, e, 1054 ecore_event_add(ev, e,
1055 _ecore_con_event_server_add_free, NULL); 1055 _ecore_con_event_server_add_free, NULL);
1056 efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL); 1056 efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
1057 _ecore_con_event_count++; 1057 _ecore_con_event_count++;
1058} 1058}
1059 1059
@@ -1132,7 +1132,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
1132 Ecore_Con_Event_Data_Received event_info = { NULL, 0 }; 1132 Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
1133 event_info.data = e->data; 1133 event_info.data = e->data;
1134 event_info.size = e->size; 1134 event_info.size = e->size;
1135 efl_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info); 1135 efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
1136 } 1136 }
1137 _ecore_con_event_count++; 1137 _ecore_con_event_count++;
1138} 1138}
@@ -1157,7 +1157,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
1157 if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE; 1157 if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE;
1158 ecore_event_add(ev, e, 1158 ecore_event_add(ev, e,
1159 (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server); 1159 (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server);
1160 efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL); 1160 efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
1161 _ecore_con_event_count++; 1161 _ecore_con_event_count++;
1162} 1162}
1163 1163
@@ -1239,7 +1239,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
1239 Ecore_Con_Event_Data_Received event_info = { NULL, 0 }; 1239 Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
1240 event_info.data = e->data; 1240 event_info.data = e->data;
1241 event_info.size = e->size; 1241 event_info.size = e->size;
1242 efl_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info); 1242 efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
1243 } 1243 }
1244 _ecore_con_event_count++; 1244 _ecore_con_event_count++;
1245} 1245}
@@ -1265,7 +1265,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
1265 DBG("%s", error); 1265 DBG("%s", error);
1266 svr->event_count = eina_list_append(svr->event_count, e); 1266 svr->event_count = eina_list_append(svr->event_count, e);
1267 ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL); 1267 ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL);
1268 efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error); 1268 efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
1269 _ecore_con_event_count++; 1269 _ecore_con_event_count++;
1270} 1270}
1271 1271
@@ -1286,7 +1286,7 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
1286 cl->event_count = eina_list_append(cl->event_count, e); 1286 cl->event_count = eina_list_append(cl->event_count, e);
1287 host_server->event_count = eina_list_append(host_server->event_count, e); 1287 host_server->event_count = eina_list_append(host_server->event_count, e);
1288 ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server); 1288 ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server);
1289 efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error); 1289 efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
1290 _ecore_con_event_count++; 1290 _ecore_con_event_count++;
1291} 1291}
1292 1292
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index c47ee5f386..9c5a83c838 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -1140,7 +1140,7 @@ _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg)
1140 e.status = status; 1140 e.status = status;
1141 e.url_con = url_obj; 1141 e.url_con = url_obj;
1142 url_con->event_count++; 1142 url_con->event_count++;
1143 efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e); 1143 efl_event_callback_legacy_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e);
1144} 1144}
1145 1145
1146static void 1146static void
@@ -1201,7 +1201,7 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp)
1201 e.size = real_size; 1201 e.size = real_size;
1202 e.data = buffer; 1202 e.data = buffer;
1203 url_con->event_count++; 1203 url_con->event_count++;
1204 efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e); 1204 efl_event_callback_legacy_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e);
1205 } 1205 }
1206 else 1206 else
1207 { 1207 {
@@ -1260,7 +1260,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u
1260 e.up.total = ultotal; 1260 e.up.total = ultotal;
1261 e.up.now = ulnow; 1261 e.up.now = ulnow;
1262 url_con->event_count++; 1262 url_con->event_count++;
1263 efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e); 1263 efl_event_callback_legacy_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e);
1264 1264
1265 return 0; 1265 return 0;
1266} 1266}
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index b873106731..2f514997a9 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -253,7 +253,7 @@ _efl_net_dialer_http_curlm_check(Efl_Net_Dialer_Http_Curlm *cm)
253 DBG("HTTP dialer=%p error: #%d '%s'", 253 DBG("HTTP dialer=%p error: #%d '%s'",
254 dialer, err, eina_error_msg_get(err)); 254 dialer, err, eina_error_msg_get(err));
255 pd->error = err; 255 pd->error = err;
256 efl_event_callback_call(dialer, EFL_NET_DIALER_EVENT_ERROR, &err); 256 efl_event_callback_legacy_call(dialer, EFL_NET_DIALER_EVENT_ERROR, &err);
257 } 257 }
258 258
259 if (msg->msg != CURLMSG_DONE) continue; 259 if (msg->msg != CURLMSG_DONE) continue;
@@ -754,7 +754,7 @@ _efl_net_dialer_http_headers_done(Eo *o, Efl_Net_Dialer_Http_Data *pd)
754 efl_net_dialer_http_response_content_type_set(o, s); 754 efl_net_dialer_http_response_content_type_set(o, s);
755 755
756 pd->pending_headers_done = EINA_FALSE; 756 pd->pending_headers_done = EINA_FALSE;
757 efl_event_callback_call(o, EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, NULL); 757 efl_event_callback_legacy_call(o, EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, NULL);
758} 758}
759 759
760/* take data from internal buffer filled with efl_io_writer_write() 760/* take data from internal buffer filled with efl_io_writer_write()
@@ -1071,7 +1071,7 @@ _efl_net_dialer_http_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Http_Dat
1071 * allow_redirects will trigger more than once 1071 * allow_redirects will trigger more than once
1072 */ 1072 */
1073 pd->connected = connected; 1073 pd->connected = connected;
1074 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); 1074 if (connected) efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL);
1075} 1075}
1076 1076
1077EOLIAN static Eina_Bool 1077EOLIAN static Eina_Bool
@@ -1135,7 +1135,7 @@ EOLIAN static void
1135_efl_net_dialer_http_efl_net_socket_address_remote_set(Eo *o, Efl_Net_Dialer_Http_Data *pd, const char *address) 1135_efl_net_dialer_http_efl_net_socket_address_remote_set(Eo *o, Efl_Net_Dialer_Http_Data *pd, const char *address)
1136{ 1136{
1137 if (eina_stringshare_replace(&pd->address_remote, address)) 1137 if (eina_stringshare_replace(&pd->address_remote, address))
1138 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 1138 efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL);
1139} 1139}
1140 1140
1141EOLIAN static const char * 1141EOLIAN static const char *
@@ -1198,7 +1198,7 @@ _efl_net_dialer_http_efl_io_reader_can_read_set(Eo *o, Efl_Net_Dialer_Http_Data
1198 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); 1198 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
1199 if (pd->can_read == can_read) return; 1199 if (pd->can_read == can_read) return;
1200 pd->can_read = can_read; 1200 pd->can_read = can_read;
1201 efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); 1201 efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
1202} 1202}
1203 1203
1204EOLIAN static Eina_Bool 1204EOLIAN static Eina_Bool
@@ -1215,7 +1215,7 @@ _efl_net_dialer_http_efl_io_reader_eos_set(Eo *o, Efl_Net_Dialer_Http_Data *pd,
1215 pd->eos = is_eos; 1215 pd->eos = is_eos;
1216 if (is_eos) pd->connected = EINA_FALSE; 1216 if (is_eos) pd->connected = EINA_FALSE;
1217 if (is_eos) 1217 if (is_eos)
1218 efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL); 1218 efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL);
1219} 1219}
1220 1220
1221EOLIAN static Eina_Error 1221EOLIAN static Eina_Error
@@ -1289,7 +1289,7 @@ _efl_net_dialer_http_efl_io_writer_can_write_set(Eo *o, Efl_Net_Dialer_Http_Data
1289 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); 1289 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
1290 if (pd->can_write == can_write) return; 1290 if (pd->can_write == can_write) return;
1291 pd->can_write = can_write; 1291 pd->can_write = can_write;
1292 efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); 1292 efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
1293} 1293}
1294 1294
1295EOLIAN static Eina_Error 1295EOLIAN static Eina_Error
@@ -1319,7 +1319,7 @@ _efl_net_dialer_http_efl_io_closer_close(Eo *o, Efl_Net_Dialer_Http_Data *pd)
1319 efl_io_reader_eos_set(o, EINA_FALSE); 1319 efl_io_reader_eos_set(o, EINA_FALSE);
1320 efl_net_dialer_connected_set(o, EINA_FALSE); 1320 efl_net_dialer_connected_set(o, EINA_FALSE);
1321 pd->closed = EINA_TRUE; 1321 pd->closed = EINA_TRUE;
1322 efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); 1322 efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
1323 return err; 1323 return err;
1324} 1324}
1325 1325
@@ -1631,7 +1631,7 @@ _efl_net_dialer_http_request_content_length_set(Eo *o, Efl_Net_Dialer_Http_Data
1631 1631
1632 pm = _efl_net_dialer_http_primary_mode_effective_get(pd); 1632 pm = _efl_net_dialer_http_primary_mode_effective_get(pd);
1633 if (pm == EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD) 1633 if (pm == EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD)
1634 efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); 1634 efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
1635} 1635}
1636 1636
1637EOLIAN static int64_t 1637EOLIAN static int64_t
@@ -1651,7 +1651,7 @@ _efl_net_dialer_http_response_content_length_set(Eo *o, Efl_Net_Dialer_Http_Data
1651 1651
1652 pm = _efl_net_dialer_http_primary_mode_effective_get(pd); 1652 pm = _efl_net_dialer_http_primary_mode_effective_get(pd);
1653 if (pm == EFL_NET_DIALER_HTTP_PRIMARY_MODE_DOWNLOAD) 1653 if (pm == EFL_NET_DIALER_HTTP_PRIMARY_MODE_DOWNLOAD)
1654 efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); 1654 efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
1655} 1655}
1656 1656
1657EOLIAN static int64_t 1657EOLIAN static int64_t
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c
index 88f78fe971..bea0652801 100644
--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@@ -115,7 +115,7 @@ _efl_net_dialer_tcp_efl_net_dialer_dial(Eo *o, Efl_Net_Dialer_Tcp_Data *pd EINA_
115 if (efl_net_ip_port_fmt(buf, sizeof(buf), (struct sockaddr *)&addr)) 115 if (efl_net_ip_port_fmt(buf, sizeof(buf), (struct sockaddr *)&addr))
116 { 116 {
117 efl_net_socket_address_remote_set(o, buf); 117 efl_net_socket_address_remote_set(o, buf);
118 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 118 efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL);
119 } 119 }
120 120
121 fd = efl_net_socket4(addr.ss_family, SOCK_STREAM, IPPROTO_TCP, efl_net_socket_fd_close_on_exec_get(o)); 121 fd = efl_net_socket4(addr.ss_family, SOCK_STREAM, IPPROTO_TCP, efl_net_socket_fd_close_on_exec_get(o));
@@ -187,7 +187,7 @@ _efl_net_dialer_tcp_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Tcp_Data
187{ 187{
188 if (pd->connected == connected) return; 188 if (pd->connected == connected) return;
189 pd->connected = connected; 189 pd->connected = connected;
190 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); 190 if (connected) efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL);
191} 191}
192 192
193EOLIAN static Eina_Bool 193EOLIAN static Eina_Bool
diff --git a/src/lib/ecore_con/efl_net_server_fd.c b/src/lib/ecore_con/efl_net_server_fd.c
index 0365669dc1..9d457f4187 100644
--- a/src/lib/ecore_con/efl_net_server_fd.c
+++ b/src/lib/ecore_con/efl_net_server_fd.c
@@ -90,7 +90,7 @@ _efl_net_server_fd_event_read(void *data EINA_UNUSED, const Eo_Event *event)
90 { 90 {
91 Eina_Error err = errno; 91 Eina_Error err = errno;
92 ERR("accept(%d): %s", fd, strerror(errno)); 92 ERR("accept(%d): %s", fd, strerror(errno));
93 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 93 efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_ERROR, &err);
94 return; 94 return;
95 } 95 }
96 96
@@ -107,7 +107,7 @@ _efl_net_server_fd_event_error(void *data EINA_UNUSED, const Eo_Event *event)
107 Eina_Error err = EBADF; 107 Eina_Error err = EBADF;
108 108
109 efl_net_server_serving_set(o, EINA_FALSE); 109 efl_net_server_serving_set(o, EINA_FALSE);
110 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 110 efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_ERROR, &err);
111} 111}
112 112
113EOLIAN static Efl_Object * 113EOLIAN static Efl_Object *
@@ -205,7 +205,7 @@ _efl_net_server_fd_efl_net_server_serving_set(Eo *o EINA_UNUSED, Efl_Net_Server_
205 if (pd->serving == serving) return; 205 if (pd->serving == serving) return;
206 pd->serving = serving; 206 pd->serving = serving;
207 if (serving) 207 if (serving)
208 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVING, NULL); 208 efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_SERVING, NULL);
209} 209}
210 210
211EOLIAN static Eina_Error 211EOLIAN static Eina_Error
diff --git a/src/lib/ecore_con/efl_net_server_tcp.c b/src/lib/ecore_con/efl_net_server_tcp.c
index b904cbba84..23b670b769 100644
--- a/src/lib/ecore_con/efl_net_server_tcp.c
+++ b/src/lib/ecore_con/efl_net_server_tcp.c
@@ -135,7 +135,7 @@ _efl_net_server_tcp_efl_net_server_serve(Eo *o, void *pd EINA_UNUSED, const char
135 error_listen: 135 error_listen:
136 close(fd); 136 close(fd);
137 error_socket: 137 error_socket:
138 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 138 efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_ERROR, &err);
139 return err; 139 return err;
140} 140}
141 141
@@ -171,7 +171,7 @@ _efl_net_server_tcp_efl_net_server_fd_client_add(Eo *o, void *pd EINA_UNUSED, in
171 } 171 }
172 172
173 efl_net_server_clients_count_set(o, efl_net_server_clients_count_get(o) + 1); 173 efl_net_server_clients_count_set(o, efl_net_server_clients_count_get(o) + 1);
174 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_CLIENT_ADD, client); 174 efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_CLIENT_ADD, client);
175 175
176 if (efl_ref_get(client) == 1) /* users must take a reference themselves */ 176 if (efl_ref_get(client) == 1) /* users must take a reference themselves */
177 { 177 {
@@ -195,7 +195,7 @@ _efl_net_server_tcp_efl_net_server_fd_client_reject(Eo *o, void *pd EINA_UNUSED,
195 efl_net_ip_port_fmt(str, sizeof(str), (struct sockaddr *)&addr); 195 efl_net_ip_port_fmt(str, sizeof(str), (struct sockaddr *)&addr);
196 196
197 close(client_fd); 197 close(client_fd);
198 efl_event_callback_call(o, EFL_NET_SERVER_EVENT_CLIENT_REJECTED, str); 198 efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_CLIENT_REJECTED, str);
199} 199}
200 200
201#include "efl_net_server_tcp.eo.c" 201#include "efl_net_server_tcp.eo.c"
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 73ffc0b8fd..f67175f3ad 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3110,7 +3110,7 @@ ecore_evas_animator_tick(Ecore_Evas *ee, Eina_Rectangle *viewport)
3110 a.update_area = *viewport; 3110 a.update_area = *viewport;
3111 } 3111 }
3112 3112
3113 efl_event_callback_call(ee->evas, EFL_EVENT_ANIMATOR_TICK, &a); 3113 efl_event_callback_legacy_call(ee->evas, EFL_EVENT_ANIMATOR_TICK, &a);
3114 3114
3115 // FIXME: We do not support partial animator in the subcanvas 3115 // FIXME: We do not support partial animator in the subcanvas
3116 EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee) 3116 EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee)
@@ -4386,7 +4386,7 @@ _direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_P
4386 ev->pressure = info->multi.pressure; 4386 ev->pressure = info->multi.pressure;
4387 ev->angle = info->multi.angle - ee->rotation; 4387 ev->angle = info->multi.angle - ee->rotation;
4388 4388
4389 efl_event_callback_call(e, _event_description_get(ev->action), evt); 4389 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4390 processed = ev->evas_done; 4390 processed = ev->evas_done;
4391 efl_del(evt); 4391 efl_del(evt);
4392 4392
@@ -4444,7 +4444,7 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
4444 ev->pressure = info->multi.pressure; 4444 ev->pressure = info->multi.pressure;
4445 ev->angle = info->multi.angle - ee->rotation; 4445 ev->angle = info->multi.angle - ee->rotation;
4446 4446
4447 efl_event_callback_call(e, _event_description_get(ev->action), evt); 4447 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4448 processed = ev->evas_done; 4448 processed = ev->evas_done;
4449 efl_del(evt); 4449 efl_del(evt);
4450 4450
@@ -4476,7 +4476,7 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info)
4476 ev->wheel.z = info->z; 4476 ev->wheel.z = info->z;
4477 ev->wheel.dir = info->direction ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL; 4477 ev->wheel.dir = info->direction ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL;
4478 4478
4479 efl_event_callback_call(e, _event_description_get(ev->action), evt); 4479 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4480 processed = ev->evas_done; 4480 processed = ev->evas_done;
4481 efl_del(evt); 4481 efl_del(evt);
4482 4482
@@ -4503,7 +4503,7 @@ _direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointe
4503 ev->timestamp = info->timestamp; 4503 ev->timestamp = info->timestamp;
4504 _pointer_position_set(ev, ee, info->x, info->y, info->x, info->y); 4504 _pointer_position_set(ev, ee, info->x, info->y, info->x, info->y);
4505 4505
4506 efl_event_callback_call(e, _event_description_get(ev->action), evt); 4506 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4507 processed = ev->evas_done; 4507 processed = ev->evas_done;
4508 efl_del(evt); 4508 efl_del(evt);
4509 4509
@@ -4610,7 +4610,7 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
4610 } 4610 }
4611 _pointer_position_set(ev, ee, x, y, x, y); 4611 _pointer_position_set(ev, ee, x, y, x, y);
4612 4612
4613 efl_event_callback_call(e, _event_description_get(ev->action), evt); 4613 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4614 processed = ev->evas_done; 4614 processed = ev->evas_done;
4615 efl_del(evt); 4615 efl_del(evt);
4616 4616
@@ -4648,9 +4648,9 @@ _direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool dow
4648 ev->device = NULL; /* FIXME */ 4648 ev->device = NULL; /* FIXME */
4649 4649
4650 if (down) 4650 if (down)
4651 efl_event_callback_call(e, EFL_EVENT_KEY_DOWN, evt); 4651 efl_event_callback_legacy_call(e, EFL_EVENT_KEY_DOWN, evt);
4652 else 4652 else
4653 efl_event_callback_call(e, EFL_EVENT_KEY_UP, evt); 4653 efl_event_callback_legacy_call(e, EFL_EVENT_KEY_UP, evt);
4654 4654
4655 processed = ev->evas_done; 4655 processed = ev->evas_done;
4656 efl_del(evt); 4656 efl_del(evt);
diff --git a/src/lib/ector/software/ector_software_buffer.c b/src/lib/ector/software/ector_software_buffer.c
index 499206309d..66c7508b96 100644
--- a/src/lib/ector/software/ector_software_buffer.c
+++ b/src/lib/ector/software/ector_software_buffer.c
@@ -69,7 +69,7 @@ _ector_software_buffer_base_pixels_clear(Eo *obj, Ector_Software_Buffer_Base_Dat
69 return; 69 return;
70 } 70 }
71 71
72 efl_event_callback_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8); 72 efl_event_callback_legacy_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8);
73 if (!pd->nofree) 73 if (!pd->nofree)
74 { 74 {
75 free(pd->pixels.u8); 75 free(pd->pixels.u8);
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 43ebd688b2..a4655597e6 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -923,7 +923,7 @@ _edje_recalc_do(Edje *ed)
923 if (!ed->calc_only) 923 if (!ed->calc_only)
924 { 924 {
925 if (ed->recalc_call) 925 if (ed->recalc_call)
926 efl_event_callback_call(ed->obj, EDJE_OBJECT_EVENT_RECALC, NULL); 926 efl_event_callback_legacy_call(ed->obj, EDJE_OBJECT_EVENT_RECALC, NULL);
927 } 927 }
928 else 928 else
929 evas_object_smart_need_recalculate_set(ed->obj, need_calc); 929 evas_object_smart_need_recalculate_set(ed->obj, need_calc);
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.c b/src/lib/efl/interfaces/efl_gfx_shape.c
index 49f59af333..2260f24c0a 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.c
+++ b/src/lib/efl/interfaces/efl_gfx_shape.c
@@ -185,8 +185,8 @@ _efl_gfx_shape_path_set(Eo *obj, Efl_Gfx_Shape_Data *pd,
185 &pd->current_ctrl.x, &pd->current_ctrl.y); 185 &pd->current_ctrl.x, &pd->current_ctrl.y);
186 186
187 end: 187 end:
188 efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); 188 efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
189 efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL); 189 efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
190} 190}
191 191
192static void 192static void
@@ -415,8 +415,8 @@ _efl_gfx_shape_interpolate(Eo *obj, Efl_Gfx_Shape_Data *pd,
415 efl_gfx_shape_stroke_dash_set(obj, dash, property_to.dash_length); 415 efl_gfx_shape_stroke_dash_set(obj, dash, property_to.dash_length);
416 efl_gfx_shape_stroke_cap_set(obj, pos_map < 0.5 ? property_from.c : property_to.c); 416 efl_gfx_shape_stroke_cap_set(obj, pos_map < 0.5 ? property_from.c : property_to.c);
417 efl_gfx_shape_stroke_join_set(obj, pos_map < 0.5 ? property_from.j : property_to.j); 417 efl_gfx_shape_stroke_join_set(obj, pos_map < 0.5 ? property_from.j : property_to.j);
418 efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); 418 efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
419 efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL); 419 efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
420 420
421 return EINA_TRUE; 421 return EINA_TRUE;
422} 422}
@@ -450,8 +450,8 @@ _efl_gfx_shape_reset(Eo *obj, Efl_Gfx_Shape_Data *pd)
450 pd->current_ctrl.x = 0; 450 pd->current_ctrl.x = 0;
451 pd->current_ctrl.y = 0; 451 pd->current_ctrl.y = 0;
452 pd->convex = EINA_FALSE; 452 pd->convex = EINA_FALSE;
453 efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); 453 efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
454 efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL); 454 efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
455} 455}
456 456
457static void 457static void
@@ -470,8 +470,8 @@ _efl_gfx_shape_append_move_to(Eo *obj, Efl_Gfx_Shape_Data *pd,
470 pd->current.x = x; 470 pd->current.x = x;
471 pd->current.y = y; 471 pd->current.y = y;
472 472
473 efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); 473 efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
474 efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL); 474 efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
475} 475}
476 476
477static void 477static void
@@ -490,8 +490,8 @@ _efl_gfx_shape_append_line_to(Eo *obj, Efl_Gfx_Shape_Data *pd,
490 pd->current.x = x; 490 pd->current.x = x;
491 pd->current.y = y; 491 pd->current.y = y;
492 492
493 efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); 493 efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
494 efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL); 494 efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
495} 495}
496 496
497static void 497static void
@@ -518,8 +518,8 @@ _efl_gfx_shape_append_cubic_to(Eo *obj, Efl_Gfx_Shape_Data *pd,
518 pd->current_ctrl.x = ctrl_x1; 518 pd->current_ctrl.x = ctrl_x1;
519 pd->current_ctrl.y = ctrl_y1; 519 pd->current_ctrl.y = ctrl_y1;
520 520
521 efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); 521 efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
522 efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL); 522 efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
523} 523}
524 524
525static void 525static void
@@ -1098,8 +1098,8 @@ _efl_gfx_shape_append_close(Eo *obj, Efl_Gfx_Shape_Data *pd)
1098 efl_gfx_path_grow(EFL_GFX_PATH_COMMAND_TYPE_CLOSE, 1098 efl_gfx_path_grow(EFL_GFX_PATH_COMMAND_TYPE_CLOSE,
1099 pd, &offset_point); 1099 pd, &offset_point);
1100 1100
1101 efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); 1101 efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
1102 efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL); 1102 efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
1103} 1103}
1104 1104
1105static void 1105static void
@@ -1822,8 +1822,8 @@ _efl_gfx_shape_dup(Eo *obj, Efl_Gfx_Shape_Data *pd, const Eo *dup_from)
1822 _efl_gfx_shape_stroke_dash_set(obj, pd, from->public.stroke.dash, from->public.stroke.dash_length); 1822 _efl_gfx_shape_stroke_dash_set(obj, pd, from->public.stroke.dash, from->public.stroke.dash_length);
1823 _efl_gfx_shape_path_set(obj, pd, from->commands, from->points); 1823 _efl_gfx_shape_path_set(obj, pd, from->commands, from->points);
1824 1824
1825 efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL); 1825 efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
1826 efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL); 1826 efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
1827} 1827}
1828 1828
1829#include "interfaces/efl_gfx_shape.eo.c" 1829#include "interfaces/efl_gfx_shape.eo.c"
diff --git a/src/lib/efl/interfaces/efl_io_buffer.c b/src/lib/efl/interfaces/efl_io_buffer.c
index 45f3ef59ad..04e5fdfd6e 100644
--- a/src/lib/efl/interfaces/efl_io_buffer.c
+++ b/src/lib/efl/interfaces/efl_io_buffer.c
@@ -39,7 +39,7 @@ _efl_io_buffer_realloc(Eo *o, Efl_Io_Buffer_Data *pd, size_t size)
39 39
40 /* no efl_io_sizer_size_set() since it could recurse! */ 40 /* no efl_io_sizer_size_set() since it could recurse! */
41 pd->used = size; 41 pd->used = size;
42 efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); 42 efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
43 } 43 }
44 44
45 if (size == 0) 45 if (size == 0)
@@ -55,7 +55,7 @@ _efl_io_buffer_realloc(Eo *o, Efl_Io_Buffer_Data *pd, size_t size)
55 55
56 pd->bytes = tmp; 56 pd->bytes = tmp;
57 pd->allocated = size; 57 pd->allocated = size;
58 efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL); 58 efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL);
59 return EINA_TRUE; 59 return EINA_TRUE;
60} 60}
61 61
@@ -127,7 +127,7 @@ _efl_io_buffer_binbuf_steal(Eo *o, Efl_Io_Buffer_Data *pd)
127 127
128 pd->bytes = NULL; 128 pd->bytes = NULL;
129 pd->allocated = 0; 129 pd->allocated = 0;
130 efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL); 130 efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL);
131 efl_io_sizer_resize(o, 0); 131 efl_io_sizer_resize(o, 0);
132 132
133 return ret; 133 return ret;
@@ -213,7 +213,7 @@ _efl_io_buffer_efl_io_reader_can_read_set(Eo *o, Efl_Io_Buffer_Data *pd, Eina_Bo
213 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); 213 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
214 if (pd->can_read == can_read) return; 214 if (pd->can_read == can_read) return;
215 pd->can_read = can_read; 215 pd->can_read = can_read;
216 efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); 216 efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
217} 217}
218 218
219EOLIAN static Eina_Bool 219EOLIAN static Eina_Bool
@@ -228,7 +228,7 @@ _efl_io_buffer_efl_io_reader_eos_set(Eo *o, Efl_Io_Buffer_Data *pd EINA_UNUSED,
228{ 228{
229 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); 229 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
230 if (is_eos) 230 if (is_eos)
231 efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL); 231 efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL);
232} 232}
233 233
234EOLIAN static Eina_Error 234EOLIAN static Eina_Error
@@ -273,7 +273,7 @@ _efl_io_buffer_efl_io_writer_write(Eo *o, Efl_Io_Buffer_Data *pd, Eina_Slice *sl
273 if (pd->used < write_pos + todo) 273 if (pd->used < write_pos + todo)
274 { 274 {
275 pd->used = write_pos + todo; 275 pd->used = write_pos + todo;
276 efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); 276 efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
277 efl_io_reader_can_read_set(o, pd->position_read < pd->used); 277 efl_io_reader_can_read_set(o, pd->position_read < pd->used);
278 } 278 }
279 efl_io_buffer_position_write_set(o, write_pos + todo); 279 efl_io_buffer_position_write_set(o, write_pos + todo);
@@ -298,7 +298,7 @@ _efl_io_buffer_efl_io_writer_can_write_set(Eo *o, Efl_Io_Buffer_Data *pd, Eina_B
298 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); 298 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
299 if (pd->can_write == can_write) return; 299 if (pd->can_write == can_write) return;
300 pd->can_write = can_write; 300 pd->can_write = can_write;
301 efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); 301 efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
302} 302}
303 303
304EOLIAN static Eina_Error 304EOLIAN static Eina_Error
@@ -307,7 +307,7 @@ _efl_io_buffer_efl_io_closer_close(Eo *o, Efl_Io_Buffer_Data *pd)
307 EINA_SAFETY_ON_TRUE_RETURN_VAL(efl_io_closer_closed_get(o), EINVAL); 307 EINA_SAFETY_ON_TRUE_RETURN_VAL(efl_io_closer_closed_get(o), EINVAL);
308 efl_io_sizer_resize(o, 0); 308 efl_io_sizer_resize(o, 0);
309 pd->closed = EINA_TRUE; 309 pd->closed = EINA_TRUE;
310 efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); 310 efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
311 return 0; 311 return 0;
312} 312}
313 313
@@ -359,9 +359,9 @@ _efl_io_buffer_efl_io_sizer_resize(Eo *o, Efl_Io_Buffer_Data *pd, uint64_t size)
359 efl_io_writer_can_write_set(o, (limit == 0) || (pos_write < limit)); 359 efl_io_writer_can_write_set(o, (limit == 0) || (pos_write < limit));
360 } 360 }
361 361
362 efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); 362 efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
363 if (reallocated) 363 if (reallocated)
364 efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL); 364 efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL);
365 365
366 return ret; 366 return ret;
367} 367}
@@ -437,9 +437,9 @@ _efl_io_buffer_position_read_set(Eo *o, Efl_Io_Buffer_Data *pd, uint64_t positio
437 changed = efl_io_positioner_position_get(o) != position; 437 changed = efl_io_positioner_position_get(o) != position;
438 438
439 pd->position_read = position; 439 pd->position_read = position;
440 efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_POSITION_READ_CHANGED, NULL); 440 efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_POSITION_READ_CHANGED, NULL);
441 if (changed) 441 if (changed)
442 efl_event_callback_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); 442 efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
443 443
444 efl_io_reader_can_read_set(o, position < size); 444 efl_io_reader_can_read_set(o, position < size);
445 efl_io_reader_eos_set(o, position >= size); 445 efl_io_reader_eos_set(o, position >= size);
@@ -469,9 +469,9 @@ _efl_io_buffer_position_write_set(Eo *o, Efl_Io_Buffer_Data *pd, uint64_t positi
469 changed = efl_io_positioner_position_get(o) != position; 469 changed = efl_io_positioner_position_get(o) != position;
470 470
471 pd->position_write = position; 471 pd->position_write = position;
472 efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_POSITION_WRITE_CHANGED, NULL); 472 efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_POSITION_WRITE_CHANGED, NULL);
473 if (changed) 473 if (changed)
474 efl_event_callback_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); 474 efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
475 475
476 limit = efl_io_buffer_limit_get(o); 476 limit = efl_io_buffer_limit_get(o);
477 efl_io_writer_can_write_set(o, (limit == 0) || (position < limit)); 477 efl_io_writer_can_write_set(o, (limit == 0) || (position < limit));
diff --git a/src/lib/efl/interfaces/efl_io_queue.c b/src/lib/efl/interfaces/efl_io_queue.c
index a4dcf3216b..2420b863f9 100644
--- a/src/lib/efl/interfaces/efl_io_queue.c
+++ b/src/lib/efl/interfaces/efl_io_queue.c
@@ -180,7 +180,7 @@ _efl_io_queue_limit_set(Eo *o, Efl_Io_Queue_Data *pd, size_t limit)
180 } 180 }
181 181
182 _efl_io_queue_adjust_and_realloc_if_needed(o, pd); 182 _efl_io_queue_adjust_and_realloc_if_needed(o, pd);
183 efl_event_callback_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); 183 efl_event_callback_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL);
184 184
185 end: 185 end:
186 _efl_io_queue_update_cans(o, pd); 186 _efl_io_queue_update_cans(o, pd);
@@ -216,7 +216,7 @@ _efl_io_queue_clear(Eo *o, Efl_Io_Queue_Data *pd)
216 pd->position_read = 0; 216 pd->position_read = 0;
217 pd->position_write = 0; 217 pd->position_write = 0;
218 efl_io_reader_can_read_set(o, EINA_FALSE); 218 efl_io_reader_can_read_set(o, EINA_FALSE);
219 efl_event_callback_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); 219 efl_event_callback_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL);
220 if (pd->pending_eos) 220 if (pd->pending_eos)
221 efl_io_reader_eos_set(o, EINA_TRUE); 221 efl_io_reader_eos_set(o, EINA_TRUE);
222} 222}
@@ -285,7 +285,7 @@ _efl_io_queue_efl_io_reader_read(Eo *o, Efl_Io_Queue_Data *pd, Eina_Rw_Slice *rw
285 pd->position_read += ro_slice.len; 285 pd->position_read += ro_slice.len;
286 286
287 efl_io_reader_can_read_set(o, pd->position_read < pd->position_write); 287 efl_io_reader_can_read_set(o, pd->position_read < pd->position_write);
288 efl_event_callback_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); 288 efl_event_callback_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL);
289 289
290 if ((pd->pending_eos) && (efl_io_queue_usage_get(o) == 0)) 290 if ((pd->pending_eos) && (efl_io_queue_usage_get(o) == 0))
291 efl_io_reader_eos_set(o, EINA_TRUE); 291 efl_io_reader_eos_set(o, EINA_TRUE);
@@ -309,7 +309,7 @@ _efl_io_queue_efl_io_reader_can_read_set(Eo *o, Efl_Io_Queue_Data *pd, Eina_Bool
309 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); 309 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
310 if (pd->can_read == can_read) return; 310 if (pd->can_read == can_read) return;
311 pd->can_read = can_read; 311 pd->can_read = can_read;
312 efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); 312 efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
313} 313}
314 314
315EOLIAN static Eina_Bool 315EOLIAN static Eina_Bool
@@ -327,7 +327,7 @@ _efl_io_queue_efl_io_reader_eos_set(Eo *o, Efl_Io_Queue_Data *pd EINA_UNUSED, Ei
327 if (is_eos) 327 if (is_eos)
328 { 328 {
329 pd->pending_eos = EINA_FALSE; 329 pd->pending_eos = EINA_FALSE;
330 efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL); 330 efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL);
331 } 331 }
332} 332}
333 333
@@ -384,7 +384,7 @@ _efl_io_queue_efl_io_writer_write(Eo *o, Efl_Io_Queue_Data *pd, Eina_Slice *slic
384 pd->position_write += todo; 384 pd->position_write += todo;
385 385
386 _efl_io_queue_adjust_and_realloc_if_needed(o, pd); 386 _efl_io_queue_adjust_and_realloc_if_needed(o, pd);
387 efl_event_callback_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); 387 efl_event_callback_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL);
388 _efl_io_queue_update_cans(o, pd); 388 _efl_io_queue_update_cans(o, pd);
389 389
390 return 0; 390 return 0;
@@ -407,7 +407,7 @@ _efl_io_queue_efl_io_writer_can_write_set(Eo *o, Efl_Io_Queue_Data *pd, Eina_Boo
407 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); 407 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
408 if (pd->can_write == can_write) return; 408 if (pd->can_write == can_write) return;
409 pd->can_write = can_write; 409 pd->can_write = can_write;
410 efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); 410 efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
411} 411}
412 412
413EOLIAN static Eina_Error 413EOLIAN static Eina_Error
@@ -417,7 +417,7 @@ _efl_io_queue_efl_io_closer_close(Eo *o, Efl_Io_Queue_Data *pd)
417 efl_io_queue_eos_mark(o); 417 efl_io_queue_eos_mark(o);
418 efl_io_queue_clear(o); 418 efl_io_queue_clear(o);
419 pd->closed = EINA_TRUE; 419 pd->closed = EINA_TRUE;
420 efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); 420 efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
421 return 0; 421 return 0;
422} 422}
423 423
diff --git a/src/lib/efl/interfaces/efl_model_common.c b/src/lib/efl/interfaces/efl_model_common.c
index 3b32205a79..ec433e64e6 100644
--- a/src/lib/efl/interfaces/efl_model_common.c
+++ b/src/lib/efl/interfaces/efl_model_common.c
@@ -94,7 +94,7 @@ efl_model_property_changed_notify(Efl_Model *model, const char *property)
94 EINA_SAFETY_ON_FALSE_GOTO(ret, on_error); 94 EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
95 95
96 Efl_Model_Property_Event evt = {.changed_properties = changed_properties}; 96 Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
97 efl_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 97 efl_event_callback_legacy_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
98 98
99on_error: 99on_error:
100 eina_array_free(changed_properties); 100 eina_array_free(changed_properties);
@@ -110,7 +110,7 @@ efl_model_property_invalidated_notify(Efl_Model *model, const char *property)
110 EINA_SAFETY_ON_FALSE_GOTO(ret, on_error); 110 EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
111 111
112 Efl_Model_Property_Event evt = {.invalidated_properties = invalidated_properties}; 112 Efl_Model_Property_Event evt = {.invalidated_properties = invalidated_properties};
113 efl_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 113 efl_event_callback_legacy_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
114 114
115on_error: 115on_error:
116 eina_array_free(invalidated_properties); 116 eina_array_free(invalidated_properties);
diff --git a/src/lib/efl/interfaces/efl_vpath_file.c b/src/lib/efl/interfaces/efl_vpath_file.c
index 37613fca11..96887e3f8d 100644
--- a/src/lib/efl/interfaces/efl_vpath_file.c
+++ b/src/lib/efl/interfaces/efl_vpath_file.c
@@ -41,7 +41,7 @@ _efl_vpath_file_do(Eo *obj EINA_UNUSED, Efl_Vpath_File_Data *pd)
41{ 41{
42 if (pd->called) return EINA_FALSE; 42 if (pd->called) return EINA_FALSE;
43 pd->called = EINA_TRUE; 43 pd->called = EINA_TRUE;
44 efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL); 44 efl_event_callback_legacy_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL);
45 return EINA_TRUE; 45 return EINA_TRUE;
46} 46}
47 47
@@ -52,9 +52,9 @@ _efl_vpath_file_wait(Eo *obj EINA_UNUSED, Efl_Vpath_File_Data *pd EINA_UNUSED)
52 { 52 {
53 pd->called = EINA_TRUE; 53 pd->called = EINA_TRUE;
54 if (pd->result) 54 if (pd->result)
55 efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL); 55 efl_event_callback_legacy_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL);
56 else 56 else
57 efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FAILED, NULL); 57 efl_event_callback_legacy_call(obj, EFL_VPATH_FILE_EVENT_FAILED, NULL);
58 } 58 }
59} 59}
60 60
diff --git a/src/lib/eio/efl_io_manager.c b/src/lib/eio/efl_io_manager.c
index 181af8c567..81514f52c9 100644
--- a/src/lib/eio/efl_io_manager.c
+++ b/src/lib/eio/efl_io_manager.c
@@ -124,7 +124,7 @@ _file_ls_filter_cb_helper(const Efl_Event_Description *event, void *data, const
124 event_info->file = file; 124 event_info->file = file;
125 event_info->filter = EINA_FALSE; 125 event_info->filter = EINA_FALSE;
126 126
127 efl_event_callback_call(operation->pdata->object, event, event_info); 127 efl_event_callback_legacy_call(operation->pdata->object, event, event_info);
128 128
129 Eina_Bool filter = event_info->filter; 129 Eina_Bool filter = event_info->filter;
130 130
@@ -213,7 +213,7 @@ _file_direct_ls_filter_cb(void *data, Eio_File *handle EINA_UNUSED, const Eina_F
213 event_info.info = info; 213 event_info.info = info;
214 event_info.filter = EINA_FALSE; 214 event_info.filter = EINA_FALSE;
215 215
216 efl_event_callback_call(operation->pdata->object, EFL_IO_MANAGER_EVENT_FILTER_DIRECT, &event_info); 216 efl_event_callback_legacy_call(operation->pdata->object, EFL_IO_MANAGER_EVENT_FILTER_DIRECT, &event_info);
217 217
218 Eina_Bool filter = event_info.filter; 218 Eina_Bool filter = event_info.filter;
219 219
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index a7ab9495a6..be6f0942c6 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -95,7 +95,7 @@ _eio_move_done_cb(void *data, Eio_File *handler EINA_UNUSED)
95 eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]); 95 eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]);
96 evt.changed_properties = properties; 96 evt.changed_properties = properties;
97 97
98 efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 98 efl_event_callback_legacy_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
99 eina_array_free(properties); 99 eina_array_free(properties);
100} 100}
101 101
@@ -180,7 +180,7 @@ _efl_model_evt_added_ecore_cb(void *data, int type, void *event)
180 eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata); 180 eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata);
181 eina_value_flush(&path); 181 eina_value_flush(&path);
182 182
183 efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt); 183 efl_event_callback_legacy_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt);
184 184
185 return EINA_TRUE; 185 return EINA_TRUE;
186} 186}
@@ -213,7 +213,7 @@ _efl_model_evt_deleted_ecore_cb(void *data, int type, void *event)
213 cevt.index = i; 213 cevt.index = i;
214 cevt.child = cur->data; 214 cevt.child = cur->data;
215 215
216 efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt); 216 efl_event_callback_legacy_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt);
217 217
218 priv->children_list = eina_list_remove_list(priv->children_list, cur); 218 priv->children_list = eina_list_remove_list(priv->children_list, cur);
219 efl_unref(cevt.child); 219 efl_unref(cevt.child);
diff --git a/src/lib/eio/eio_sentry.c b/src/lib/eio/eio_sentry.c
index c21b0c2052..153828ee8f 100644
--- a/src/lib/eio/eio_sentry.c
+++ b/src/lib/eio/eio_sentry.c
@@ -73,7 +73,7 @@ _handle_event(void *data, int type, void *event)
73 event_info->source = eio_monitor_path_get(monitor_event->monitor); 73 event_info->source = eio_monitor_path_get(monitor_event->monitor);
74 event_info->trigger = monitor_event->filename; 74 event_info->trigger = monitor_event->filename;
75 75
76 efl_event_callback_call(pd->object, translated_event, event_info); 76 efl_event_callback_legacy_call(pd->object, translated_event, event_info);
77 77
78 // If event was error, we must delete the monitor. 78 // If event was error, we must delete the monitor.
79 if (type == EIO_MONITOR_ERROR) 79 if (type == EIO_MONITOR_ERROR)
diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index f9f7f51c47..b78409194e 100644
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -290,7 +290,7 @@ eldbus_model_arguments_process_arguments(Eldbus_Model_Arguments_Data *pd,
290 if (eina_array_count(changed_properties)) 290 if (eina_array_count(changed_properties))
291 { 291 {
292 Efl_Model_Property_Event evt = {.changed_properties = changed_properties}; 292 Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
293 efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 293 efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
294 } 294 }
295 295
296 result = EINA_TRUE; 296 result = EINA_TRUE;
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index 465673ad33..558cb85acd 100644
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -341,7 +341,7 @@ _eldbus_model_connection_names_list_cb(void *data,
341 count = eina_list_count(pd->children_list); 341 count = eina_list_count(pd->children_list);
342 342
343 if (count) 343 if (count)
344 efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count); 344 efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count);
345 345
346 pd->is_listed = EINA_TRUE; 346 pd->is_listed = EINA_TRUE;
347 347
diff --git a/src/lib/eldbus/eldbus_model_method.c b/src/lib/eldbus/eldbus_model_method.c
index e36f941a0d..5adc31b5e6 100644
--- a/src/lib/eldbus/eldbus_model_method.c
+++ b/src/lib/eldbus/eldbus_model_method.c
@@ -95,7 +95,7 @@ _eldbus_model_method_call_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendi
95 Eldbus_Model_Arguments_Data *args_data = efl_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS); 95 Eldbus_Model_Arguments_Data *args_data = efl_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
96 96
97 if (eldbus_model_arguments_process_arguments(args_data, msg, pending)) 97 if (eldbus_model_arguments_process_arguments(args_data, msg, pending))
98 efl_event_callback_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL); 98 efl_event_callback_legacy_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL);
99} 99}
100 100
101#include "eldbus_model_method.eo.c" 101#include "eldbus_model_method.eo.c"
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 54eb6c667a..0b5ba49fd5 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -620,7 +620,7 @@ _eldbus_model_proxy_property_get_all_cb(void *data,
620 .changed_properties = changed_properties 620 .changed_properties = changed_properties
621 }; 621 };
622 622
623 efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 623 efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
624 } 624 }
625 625
626 eina_array_free(changed_properties); 626 eina_array_free(changed_properties);
@@ -686,7 +686,7 @@ _eldbus_model_proxy_property_set_cb(void *data,
686 .changed_properties = pd->properties_array 686 .changed_properties = pd->properties_array
687 }; 687 };
688 688
689 efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 689 efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
690 efl_model_property_changed_notify(pd->obj, property_set_data->property); 690 efl_model_property_changed_notify(pd->obj, property_set_data->property);
691 691
692 } 692 }
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 068811939a..c8124d0cd5 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -29,7 +29,7 @@ _child_added_cb_proxy(void *data, const Eo_Event *event)
29 Evas_Object *box = data; 29 Evas_Object *box = data;
30 Evas_Object_Box_Option *opt = event->info; 30 Evas_Object_Box_Option *opt = event->info;
31 31
32 efl_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_ADDED, opt->obj); 32 efl_event_callback_legacy_call(box, EFL_CONTAINER_EVENT_CONTENT_ADDED, opt->obj);
33} 33}
34 34
35static void 35static void
@@ -38,7 +38,7 @@ _child_removed_cb_proxy(void *data, const Eo_Event *event)
38 Evas_Object *box = data; 38 Evas_Object *box = data;
39 Evas_Object *child = event->info; 39 Evas_Object *child = event->info;
40 40
41 efl_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child); 41 efl_event_callback_legacy_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child);
42} 42}
43 43
44EOLIAN static Eina_Bool 44EOLIAN static Eina_Bool
@@ -151,7 +151,7 @@ EOLIAN static void
151_efl_ui_box_efl_pack_layout_layout_update(Eo *obj, Efl_Ui_Box_Data *pd) 151_efl_ui_box_efl_pack_layout_layout_update(Eo *obj, Efl_Ui_Box_Data *pd)
152{ 152{
153 efl_pack_layout_do(pd->layout_engine, obj, pd->layout_data); 153 efl_pack_layout_do(pd->layout_engine, obj, pd->layout_data);
154 efl_event_callback_call(obj, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL); 154 efl_event_callback_legacy_call(obj, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL);
155} 155}
156 156
157EOLIAN static void 157EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 5dc8214f07..08adc4f112 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -1337,7 +1337,7 @@ _flip(Evas_Object *obj)
1337 sd->state = sd->next_state; 1337 sd->state = sd->next_state;
1338 _configure(obj); 1338 _configure(obj);
1339 _flip_show_hide(obj); 1339 _flip_show_hide(obj);
1340 efl_event_callback_call(obj, EFL_UI_FLIP_EVENT_ANIMATE_DONE, NULL); 1340 efl_event_callback_legacy_call(obj, EFL_UI_FLIP_EVENT_ANIMATE_DONE, NULL);
1341 1341
1342 // update the new front and back object. 1342 // update the new front and back object.
1343 _update_front_back(obj, sd); 1343 _update_front_back(obj, sd);
@@ -1521,7 +1521,7 @@ _event_anim(void *data,
1521 _flip_show_hide(sd->obj); 1521 _flip_show_hide(sd->obj);
1522 _configure(sd->obj); 1522 _configure(sd->obj);
1523 sd->animator = NULL; 1523 sd->animator = NULL;
1524 efl_event_callback_call 1524 efl_event_callback_legacy_call
1525 (sd->obj, EFL_UI_FLIP_EVENT_ANIMATE_DONE, NULL); 1525 (sd->obj, EFL_UI_FLIP_EVENT_ANIMATE_DONE, NULL);
1526 1526
1527 return ECORE_CALLBACK_CANCEL; 1527 return ECORE_CALLBACK_CANCEL;
@@ -1708,7 +1708,7 @@ _move_cb(void *data,
1708 evas_smart_objects_calculate(evas_object_evas_get(data)); 1708 evas_smart_objects_calculate(evas_object_evas_get(data));
1709 _configure(fl); 1709 _configure(fl);
1710 // FIXME: end hack 1710 // FIXME: end hack
1711 efl_event_callback_call(fl, EFL_UI_FLIP_EVENT_ANIMATE_BEGIN, NULL); 1711 efl_event_callback_legacy_call(fl, EFL_UI_FLIP_EVENT_ANIMATE_BEGIN, NULL);
1712 } 1712 }
1713 else return; 1713 else return;
1714 } 1714 }
@@ -1928,7 +1928,7 @@ _internal_elm_flip_go_to(Evas_Object *obj,
1928 evas_smart_objects_calculate(evas_object_evas_get(obj)); 1928 evas_smart_objects_calculate(evas_object_evas_get(obj));
1929 _configure(obj); 1929 _configure(obj);
1930 // FIXME: end hack 1930 // FIXME: end hack
1931 efl_event_callback_call(obj, EFL_UI_FLIP_EVENT_ANIMATE_BEGIN, NULL); 1931 efl_event_callback_legacy_call(obj, EFL_UI_FLIP_EVENT_ANIMATE_BEGIN, NULL);
1932 1932
1933 // set focus to the content object when flip go to is called 1933 // set focus to the content object when flip go to is called
1934 if (elm_object_focus_get(obj)) 1934 if (elm_object_focus_get(obj))
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 3b19afec8f..5e89c04959 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -136,7 +136,7 @@ _on_frame_clicked(void *data,
136 sd->collapsed++; 136 sd->collapsed++;
137 sd->anim = EINA_TRUE; 137 sd->anim = EINA_TRUE;
138 } 138 }
139 efl_event_callback_call 139 efl_event_callback_legacy_call
140 (data, EFL_UI_EVENT_CLICKED, NULL); 140 (data, EFL_UI_EVENT_CLICKED, NULL);
141} 141}
142 142
@@ -246,7 +246,7 @@ _efl_ui_frame_collapse_go(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
246 if (sd->collapsed == collapse) return; 246 if (sd->collapsed == collapse) return;
247 247
248 elm_layout_signal_emit(obj, "elm,action,toggle", "elm"); 248 elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
249 efl_event_callback_call 249 efl_event_callback_legacy_call
250 (wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, obj); 250 (wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, obj);
251 sd->collapsed = collapse; 251 sd->collapsed = collapse;
252 sd->anim = EINA_TRUE; 252 sd->anim = EINA_TRUE;
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index c402d365a6..3b673e97b3 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -127,7 +127,7 @@ _efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
127static void 127static void
128_layout_updated_emit(Efl_Ui_Grid *obj) 128_layout_updated_emit(Efl_Ui_Grid *obj)
129{ 129{
130 efl_event_callback_call(obj, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL); 130 efl_event_callback_legacy_call(obj, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL);
131} 131}
132 132
133static void 133static void
@@ -408,7 +408,7 @@ _pack_at(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj,
408 408
409 efl_key_data_set(subobj, GRID_ITEM_KEY, gi); 409 efl_key_data_set(subobj, GRID_ITEM_KEY, gi);
410 elm_widget_sub_object_add(obj, subobj); 410 elm_widget_sub_object_add(obj, subobj);
411 efl_event_callback_call(obj, EFL_CONTAINER_EVENT_CONTENT_ADDED, subobj); 411 efl_event_callback_legacy_call(obj, EFL_CONTAINER_EVENT_CONTENT_ADDED, subobj);
412 efl_event_callback_array_add(subobj, subobj_callbacks(), obj); 412 efl_event_callback_array_add(subobj, subobj_callbacks(), obj);
413 } 413 }
414 414
@@ -514,7 +514,7 @@ _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj)
514 } 514 }
515 515
516end: 516end:
517 efl_event_callback_call(obj, EFL_CONTAINER_EVENT_CONTENT_REMOVED, subobj); 517 efl_event_callback_legacy_call(obj, EFL_CONTAINER_EVENT_CONTENT_REMOVED, subobj);
518 pd->items = (Grid_Item *) 518 pd->items = (Grid_Item *)
519 eina_inlist_remove(EINA_INLIST_GET(pd->items), EINA_INLIST_GET(gi)); 519 eina_inlist_remove(EINA_INLIST_GET(pd->items), EINA_INLIST_GET(gi));
520 pd->count--; 520 pd->count--;
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index a392b6eab4..3c697aa545 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -78,7 +78,7 @@ _on_mouse_up(void *data,
78 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; 78 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
79 if (!wd->still_in) return; 79 if (!wd->still_in) return;
80 80
81 efl_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL); 81 efl_event_callback_legacy_call(data, EFL_UI_EVENT_CLICKED, NULL);
82} 82}
83 83
84static Eina_Bool 84static Eina_Bool
@@ -380,7 +380,7 @@ _efl_ui_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
380 ERR("Async open failed for an unknown reason."); 380 ERR("Async open failed for an unknown reason.");
381 sd->async_failed = EINA_TRUE; 381 sd->async_failed = EINA_TRUE;
382 eina_spinlock_release(&sd->async.lck); 382 eina_spinlock_release(&sd->async.lck);
383 efl_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL); 383 efl_event_callback_legacy_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL);
384 return; 384 return;
385 } 385 }
386 386
@@ -410,7 +410,7 @@ _efl_ui_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
410 sd->async_failed = EINA_FALSE; 410 sd->async_failed = EINA_FALSE;
411 ELM_SAFE_FREE(sd->async.file, eina_stringshare_del); 411 ELM_SAFE_FREE(sd->async.file, eina_stringshare_del);
412 ELM_SAFE_FREE(sd->async.key, eina_stringshare_del); 412 ELM_SAFE_FREE(sd->async.key, eina_stringshare_del);
413 efl_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_OPENED, NULL); 413 efl_event_callback_legacy_call(obj, EFL_FILE_EVENT_ASYNC_OPENED, NULL);
414 _efl_ui_image_internal_sizing_eval(obj, sd); 414 _efl_ui_image_internal_sizing_eval(obj, sd);
415 } 415 }
416 else 416 else
@@ -418,7 +418,7 @@ _efl_ui_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
418 // TODO: Implement Efl.File async,error event_info type 418 // TODO: Implement Efl.File async,error event_info type
419 sd->async_failed = EINA_TRUE; 419 sd->async_failed = EINA_TRUE;
420 // keep file,key around for file_get 420 // keep file,key around for file_get
421 efl_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL); 421 efl_event_callback_legacy_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL);
422 } 422 }
423 423
424 // close f, map and free strings 424 // close f, map and free strings
@@ -565,7 +565,7 @@ _efl_ui_image_drag_n_drop_cb(void *elm_obj,
565 DBG("dnd: %s, %s, %s", elm_widget_type_get(elm_obj), 565 DBG("dnd: %s, %s, %s", elm_widget_type_get(elm_obj),
566 SIG_DND, (char *)drop->data); 566 SIG_DND, (char *)drop->data);
567 567
568 efl_event_callback_call(elm_obj, EFL_UI_IMAGE_EVENT_DROP, drop->data); 568 efl_event_callback_legacy_call(elm_obj, EFL_UI_IMAGE_EVENT_DROP, drop->data);
569 return EINA_TRUE; 569 return EINA_TRUE;
570 } 570 }
571 571
@@ -747,7 +747,7 @@ _efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
747static Eina_Bool 747static Eina_Bool
748_key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) 748_key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
749{ 749{
750 efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL); 750 efl_event_callback_legacy_call(obj, EFL_UI_EVENT_CLICKED, NULL);
751 return EINA_TRUE; 751 return EINA_TRUE;
752} 752}
753 753
@@ -977,7 +977,7 @@ _efl_ui_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *downloa
977 977
978 free(sd->remote_data); 978 free(sd->remote_data);
979 sd->remote_data = NULL; 979 sd->remote_data = NULL;
980 efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err); 980 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
981 } 981 }
982 else 982 else
983 { 983 {
@@ -987,7 +987,7 @@ _efl_ui_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *downloa
987 evas_object_image_preload(sd->img, EINA_FALSE); 987 evas_object_image_preload(sd->img, EINA_FALSE);
988 } 988 }
989 989
990 efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_DONE, NULL); 990 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_DONE, NULL);
991 } 991 }
992 992
993 ELM_SAFE_FREE(sd->key, eina_stringshare_del); 993 ELM_SAFE_FREE(sd->key, eina_stringshare_del);
@@ -1000,7 +1000,7 @@ _efl_ui_image_smart_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int er
1000 Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS); 1000 Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
1001 Efl_Ui_Image_Error err = { error, EINA_FALSE }; 1001 Efl_Ui_Image_Error err = { error, EINA_FALSE };
1002 1002
1003 efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err); 1003 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
1004 1004
1005 sd->remote = NULL; 1005 sd->remote = NULL;
1006 ELM_SAFE_FREE(sd->key, eina_stringshare_del); 1006 ELM_SAFE_FREE(sd->key, eina_stringshare_del);
@@ -1014,7 +1014,7 @@ _efl_ui_image_smart_download_progress(void *data, Elm_Url *url EINA_UNUSED, doub
1014 1014
1015 progress.now = now; 1015 progress.now = now;
1016 progress.total = total; 1016 progress.total = total;
1017 efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_PROGRESS, &progress); 1017 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_PROGRESS, &progress);
1018} 1018}
1019 1019
1020static const char *remote_uri[] = { 1020static const char *remote_uri[] = {
@@ -1049,7 +1049,7 @@ _efl_ui_image_efl_file_file_set(Eo *obj, Efl_Ui_Image_Data *sd, const char *file
1049 obj); 1049 obj);
1050 if (sd->remote) 1050 if (sd->remote)
1051 { 1051 {
1052 efl_event_callback_call 1052 efl_event_callback_legacy_call
1053 (obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_START, NULL); 1053 (obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_START, NULL);
1054 eina_stringshare_replace(&sd->key, key); 1054 eina_stringshare_replace(&sd->key, key);
1055 return EINA_TRUE; 1055 return EINA_TRUE;
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index 6a98319260..e531382e78 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -357,7 +357,7 @@ _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_U
357 357
358 char *tmp = efl_canvas_text_range_text_get(obj, en->sel_start, en->sel_end); 358 char *tmp = efl_canvas_text_range_text_get(obj, en->sel_start, en->sel_end);
359 359
360 efl_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info); 360 efl_event_callback_legacy_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
361 361
362 free(tmp); 362 free(tmp);
363 363
@@ -506,7 +506,7 @@ _sel_cursor_changed(void *data, const Eo_Event *event EINA_UNUSED)
506{ 506{
507 Efl_Canvas_Text_Cursor *obj = data; 507 Efl_Canvas_Text_Cursor *obj = data;
508 508
509 efl_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL); 509 efl_event_callback_legacy_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL);
510} 510}
511 511
512static void 512static void
@@ -597,7 +597,7 @@ _range_del_emit(Evas_Object *obj, Efl_Canvas_Text_Cursor *cur1, Efl_Canvas_Text_
597 tmp = efl_canvas_text_range_text_get(obj, cur1, cur2); 597 tmp = efl_canvas_text_range_text_get(obj, cur1, cur2);
598 info.content = tmp; 598 info.content = tmp;
599 599
600 efl_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info); 600 efl_event_callback_legacy_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
601 601
602 if (tmp) free(tmp); 602 if (tmp) free(tmp);
603 603
@@ -628,7 +628,7 @@ _delete_emit(Evas_Textblock_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data *en
628 info.length = 1; 628 info.length = 1;
629 info.content = tmp; 629 info.content = tmp;
630 630
631 efl_event_callback_call((Eo *) efl_canvas_text_cursor_text_object_get(c), 631 efl_event_callback_legacy_call((Eo *) efl_canvas_text_cursor_text_object_get(c),
632 EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info); 632 EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
633 if (tmp) free(tmp); 633 if (tmp) free(tmp);
634 634
@@ -1016,7 +1016,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1016 info.position = efl_canvas_text_cursor_position_get(cur); 1016 info.position = efl_canvas_text_cursor_position_get(cur);
1017 info.length = eina_unicode_utf8_get_len(string); 1017 info.length = eina_unicode_utf8_get_len(string);
1018 1018
1019 efl_event_callback_call(obj, 1019 efl_event_callback_legacy_call(obj,
1020 EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info); 1020 EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
1021 1021
1022 efl_canvas_text_cursor_text_insert(cur, string); 1022 efl_canvas_text_cursor_text_insert(cur, string);
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index 254b25238b..4f5f89c693 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -58,7 +58,7 @@ _state_active(Evas_Object *obj, Efl_Ui_Nstate_Data *sd)
58 elm_layout_signal_emit(obj, buf, "elm"); 58 elm_layout_signal_emit(obj, buf, "elm");
59 edje_object_message_signal_process(elm_layout_edje_get(obj)); 59 edje_object_message_signal_process(elm_layout_edje_get(obj));
60 elm_obj_layout_sizing_eval(obj); 60 elm_obj_layout_sizing_eval(obj);
61 efl_event_callback_call(obj, EFL_UI_NSTATE_EVENT_STATE_CHANGED, NULL); 61 efl_event_callback_legacy_call(obj, EFL_UI_NSTATE_EVENT_STATE_CHANGED, NULL);
62} 62}
63 63
64static void 64static void
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index b0c17a0566..8475fdf579 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -443,7 +443,7 @@ _validate(Evas_Object *obj)
443 if (sd->validators == 0) return; 443 if (sd->validators == 0) return;
444 444
445 vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text"); 445 vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text");
446 res = efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc); 446 res = efl_event_callback_legacy_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc);
447 buf = eina_strbuf_new(); 447 buf = eina_strbuf_new();
448 eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass"); 448 eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass");
449 edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm"); 449 edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm");
@@ -1022,7 +1022,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
1022 evas_event_thaw(evas_object_evas_get(obj)); 1022 evas_event_thaw(evas_object_evas_get(obj));
1023 evas_event_thaw_eval(evas_object_evas_get(obj)); 1023 evas_event_thaw_eval(evas_object_evas_get(obj));
1024 1024
1025 efl_event_callback_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL); 1025 efl_event_callback_legacy_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
1026 1026
1027 evas_object_unref(obj); 1027 evas_object_unref(obj);
1028 1028
@@ -1034,7 +1034,7 @@ _cursor_geometry_recalc(Evas_Object *obj)
1034{ 1034{
1035 EFL_UI_TEXT_DATA_GET(obj, sd); 1035 EFL_UI_TEXT_DATA_GET(obj, sd);
1036 1036
1037 efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_CURSOR_CHANGED, NULL); 1037 efl_event_callback_legacy_call(obj, EFL_UI_TEXT_EVENT_CURSOR_CHANGED, NULL);
1038 1038
1039 Evas_Coord x, y, w, h; 1039 Evas_Coord x, y, w, h;
1040 Evas_Coord x2, y2, w2, h2; 1040 Evas_Coord x2, y2, w2, h2;
@@ -1125,7 +1125,7 @@ _efl_ui_text_elm_widget_on_focus(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Object_Item
1125 if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand && 1125 if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand &&
1126 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text")) 1126 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
1127 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); 1127 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
1128 efl_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL); 1128 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
1129 if (_elm_config->atspi_mode) 1129 if (_elm_config->atspi_mode)
1130 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 1130 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
1131 _return_key_enabled_check(obj); 1131 _return_key_enabled_check(obj);
@@ -1143,7 +1143,7 @@ _efl_ui_text_elm_widget_on_focus(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Object_Item
1143 if (top && top_is_win && sd->input_panel_enable && 1143 if (top && top_is_win && sd->input_panel_enable &&
1144 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text")) 1144 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
1145 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); 1145 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
1146 efl_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL); 1146 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
1147 if (_elm_config->atspi_mode) 1147 if (_elm_config->atspi_mode)
1148 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); 1148 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
1149 1149
@@ -1384,7 +1384,7 @@ _paste_cb(Eo *obj)
1384 1384
1385 EFL_UI_TEXT_DATA_GET(obj, sd); 1385 EFL_UI_TEXT_DATA_GET(obj, sd);
1386 1386
1387 efl_event_callback_call 1387 efl_event_callback_legacy_call
1388 (obj, EFL_UI_EVENT_SELECTION_PASTE, NULL); 1388 (obj, EFL_UI_EVENT_SELECTION_PASTE, NULL);
1389 1389
1390 sd->selection_asked = EINA_TRUE; 1390 sd->selection_asked = EINA_TRUE;
@@ -1449,7 +1449,7 @@ _cut_cb(Eo *obj)
1449 Efl_Canvas_Text_Cursor *start, *end; 1449 Efl_Canvas_Text_Cursor *start, *end;
1450 EFL_UI_TEXT_DATA_GET(obj, sd); 1450 EFL_UI_TEXT_DATA_GET(obj, sd);
1451 1451
1452 efl_event_callback_call 1452 efl_event_callback_legacy_call
1453 (obj, EFL_UI_EVENT_SELECTION_CUT, NULL); 1453 (obj, EFL_UI_EVENT_SELECTION_CUT, NULL);
1454 /* Store it */ 1454 /* Store it */
1455 sd->sel_mode = EINA_FALSE; 1455 sd->sel_mode = EINA_FALSE;
@@ -1479,7 +1479,7 @@ _copy_cb(Eo *obj)
1479{ 1479{
1480 EFL_UI_TEXT_DATA_GET(obj, sd); 1480 EFL_UI_TEXT_DATA_GET(obj, sd);
1481 1481
1482 efl_event_callback_call 1482 efl_event_callback_legacy_call
1483 (obj, EFL_UI_EVENT_SELECTION_COPY, NULL); 1483 (obj, EFL_UI_EVENT_SELECTION_COPY, NULL);
1484 sd->sel_mode = EINA_FALSE; 1484 sd->sel_mode = EINA_FALSE;
1485 if (!_elm_config->desktop_entry) 1485 if (!_elm_config->desktop_entry)
@@ -1539,7 +1539,7 @@ _menu_call(Evas_Object *obj)
1539 1539
1540 if (sd->anchor_hover.hover) return; 1540 if (sd->anchor_hover.hover) return;
1541 1541
1542 efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_CONTEXT_OPEN, NULL); 1542 efl_event_callback_legacy_call(obj, EFL_UI_TEXT_EVENT_CONTEXT_OPEN, NULL);
1543 1543
1544 if ((sd->api) && (sd->api->obj_longpress)) 1544 if ((sd->api) && (sd->api->obj_longpress))
1545 { 1545 {
@@ -1822,7 +1822,7 @@ _long_press_cb(void *data)
1822 sd->long_pressed = EINA_TRUE; 1822 sd->long_pressed = EINA_TRUE;
1823 1823
1824 sd->longpress_timer = NULL; 1824 sd->longpress_timer = NULL;
1825 efl_event_callback_call 1825 efl_event_callback_legacy_call
1826 (data, EFL_UI_EVENT_LONGPRESSED, NULL); 1826 (data, EFL_UI_EVENT_LONGPRESSED, NULL);
1827 1827
1828 return ECORE_CALLBACK_CANCEL; 1828 return ECORE_CALLBACK_CANCEL;
@@ -2069,7 +2069,7 @@ _entry_changed_handle(void *data,
2069 /* callback - this could call callbacks that delete the 2069 /* callback - this could call callbacks that delete the
2070 * entry... thus... any access to sd after this could be 2070 * entry... thus... any access to sd after this could be
2071 * invalid */ 2071 * invalid */
2072 efl_event_callback_call(data, event, NULL); 2072 efl_event_callback_legacy_call(data, event, NULL);
2073} 2073}
2074 2074
2075static void 2075static void
@@ -2085,11 +2085,11 @@ _entry_changed_user_signal_cb(void *data,
2085 if (edje_info) 2085 if (edje_info)
2086 { 2086 {
2087 memcpy(&info, edje_info, sizeof(info)); 2087 memcpy(&info, edje_info, sizeof(info));
2088 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_CHANGED_USER, &info); 2088 efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_CHANGED_USER, &info);
2089 } 2089 }
2090 else 2090 else
2091 { 2091 {
2092 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_CHANGED_USER, NULL); 2092 efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_CHANGED_USER, NULL);
2093 } 2093 }
2094 if (_elm_config->atspi_mode) 2094 if (_elm_config->atspi_mode)
2095 { 2095 {
@@ -2126,7 +2126,7 @@ _entry_undo_request_signal_cb(void *data,
2126 const char *emission EINA_UNUSED, 2126 const char *emission EINA_UNUSED,
2127 const char *source EINA_UNUSED) 2127 const char *source EINA_UNUSED)
2128{ 2128{
2129 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_UNDO_REQUEST, NULL); 2129 efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_UNDO_REQUEST, NULL);
2130} 2130}
2131 2131
2132static void 2132static void
@@ -2135,7 +2135,7 @@ _entry_redo_request_signal_cb(void *data,
2135 const char *emission EINA_UNUSED, 2135 const char *emission EINA_UNUSED,
2136 const char *source EINA_UNUSED) 2136 const char *source EINA_UNUSED)
2137{ 2137{
2138 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_REDO_REQUEST, NULL); 2138 efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_REDO_REQUEST, NULL);
2139} 2139}
2140 2140
2141static void 2141static void
@@ -2161,7 +2161,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
2161 const char *emission EINA_UNUSED, 2161 const char *emission EINA_UNUSED,
2162 const char *source EINA_UNUSED) 2162 const char *source EINA_UNUSED)
2163{ 2163{
2164 efl_event_callback_call 2164 efl_event_callback_legacy_call
2165 (data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL); 2165 (data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL);
2166 if (_elm_config->atspi_mode) 2166 if (_elm_config->atspi_mode)
2167 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2167 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
@@ -2220,7 +2220,7 @@ _entry_anchor_down_signal_cb(void *data,
2220 _signal_anchor_geoms_do_things_with_lol(sd, &ei); 2220 _signal_anchor_geoms_do_things_with_lol(sd, &ei);
2221 2221
2222 if (!sd->disabled) 2222 if (!sd->disabled)
2223 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_DOWN, &ei); 2223 efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ANCHOR_DOWN, &ei);
2224} 2224}
2225 2225
2226static void 2226static void
@@ -2243,7 +2243,7 @@ _entry_anchor_up_signal_cb(void *data,
2243 _signal_anchor_geoms_do_things_with_lol(sd, &ei); 2243 _signal_anchor_geoms_do_things_with_lol(sd, &ei);
2244 2244
2245 if (!sd->disabled) 2245 if (!sd->disabled)
2246 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_UP, &ei); 2246 efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ANCHOR_UP, &ei);
2247} 2247}
2248 2248
2249static void 2249static void
@@ -2324,7 +2324,7 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
2324 ei.hover_right = tmp; 2324 ei.hover_right = tmp;
2325 } 2325 }
2326 2326
2327 efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_ANCHOR_HOVER_OPENED, &ei); 2327 efl_event_callback_legacy_call(obj, EFL_UI_TEXT_EVENT_ANCHOR_HOVER_OPENED, &ei);
2328 efl_event_callback_add 2328 efl_event_callback_add
2329 (sd->anchor_hover.hover, EFL_UI_EVENT_CLICKED, _anchor_hover_clicked_cb, obj); 2329 (sd->anchor_hover.hover, EFL_UI_EVENT_CLICKED, _anchor_hover_clicked_cb, obj);
2330 2330
@@ -2364,7 +2364,7 @@ _entry_anchor_clicked_signal_cb(void *data,
2364 2364
2365 if (!sd->disabled) 2365 if (!sd->disabled)
2366 { 2366 {
2367 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_CLICKED, &ei); 2367 efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ANCHOR_CLICKED, &ei);
2368 _entry_hover_anchor_clicked_do(data, &ei); 2368 _entry_hover_anchor_clicked_do(data, &ei);
2369 } 2369 }
2370} 2370}
@@ -2394,7 +2394,7 @@ _entry_anchor_in_signal_cb(void *data,
2394 _signal_anchor_geoms_do_things_with_lol(sd, &ei); 2394 _signal_anchor_geoms_do_things_with_lol(sd, &ei);
2395 2395
2396 if (!sd->disabled) 2396 if (!sd->disabled)
2397 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_IN, &ei); 2397 efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ANCHOR_IN, &ei);
2398} 2398}
2399 2399
2400static void 2400static void
@@ -2414,7 +2414,7 @@ _entry_anchor_out_signal_cb(void *data,
2414 _signal_anchor_geoms_do_things_with_lol(sd, &ei); 2414 _signal_anchor_geoms_do_things_with_lol(sd, &ei);
2415 2415
2416 if (!sd->disabled) 2416 if (!sd->disabled)
2417 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_OUT, &ei); 2417 efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ANCHOR_OUT, &ei);
2418} 2418}
2419 2419
2420static void 2420static void
@@ -2423,7 +2423,7 @@ _entry_key_enter_signal_cb(void *data,
2423 const char *emission EINA_UNUSED, 2423 const char *emission EINA_UNUSED,
2424 const char *source EINA_UNUSED) 2424 const char *source EINA_UNUSED)
2425{ 2425{
2426 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ACTIVATED, NULL); 2426 efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ACTIVATED, NULL);
2427} 2427}
2428 2428
2429static void 2429static void
@@ -2432,7 +2432,7 @@ _entry_key_escape_signal_cb(void *data,
2432 const char *emission EINA_UNUSED, 2432 const char *emission EINA_UNUSED,
2433 const char *source EINA_UNUSED) 2433 const char *source EINA_UNUSED)
2434{ 2434{
2435 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ABORTED, NULL); 2435 efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ABORTED, NULL);
2436} 2436}
2437 2437
2438static void 2438static void
@@ -2441,7 +2441,7 @@ _entry_mouse_down_signal_cb(void *data,
2441 const char *emission EINA_UNUSED, 2441 const char *emission EINA_UNUSED,
2442 const char *source EINA_UNUSED) 2442 const char *source EINA_UNUSED)
2443{ 2443{
2444 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_PRESS, NULL); 2444 efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_PRESS, NULL);
2445} 2445}
2446 2446
2447static void 2447static void
@@ -2450,7 +2450,7 @@ _entry_mouse_clicked_signal_cb(void *data,
2450 const char *emission EINA_UNUSED, 2450 const char *emission EINA_UNUSED,
2451 const char *source EINA_UNUSED) 2451 const char *source EINA_UNUSED)
2452{ 2452{
2453 efl_event_callback_call 2453 efl_event_callback_legacy_call
2454 (data, EFL_UI_EVENT_CLICKED, NULL); 2454 (data, EFL_UI_EVENT_CLICKED, NULL);
2455} 2455}
2456 2456
@@ -2460,7 +2460,7 @@ _entry_mouse_double_signal_cb(void *data,
2460 const char *emission EINA_UNUSED, 2460 const char *emission EINA_UNUSED,
2461 const char *source EINA_UNUSED) 2461 const char *source EINA_UNUSED)
2462{ 2462{
2463 efl_event_callback_call 2463 efl_event_callback_legacy_call
2464 (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL); 2464 (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
2465} 2465}
2466 2466
@@ -2470,7 +2470,7 @@ _entry_mouse_triple_signal_cb(void *data,
2470 const char *emission EINA_UNUSED, 2470 const char *emission EINA_UNUSED,
2471 const char *source EINA_UNUSED) 2471 const char *source EINA_UNUSED)
2472{ 2472{
2473 efl_event_callback_call 2473 efl_event_callback_legacy_call
2474 (data, EFL_UI_EVENT_CLICKED_TRIPLE, NULL); 2474 (data, EFL_UI_EVENT_CLICKED_TRIPLE, NULL);
2475} 2475}
2476 2476
@@ -2623,7 +2623,7 @@ _text_append_idler(void *data)
2623 free(sd->append_text_left); 2623 free(sd->append_text_left);
2624 sd->append_text_left = NULL; 2624 sd->append_text_left = NULL;
2625 sd->append_text_idler = NULL; 2625 sd->append_text_idler = NULL;
2626 efl_event_callback_call 2626 efl_event_callback_legacy_call
2627 (obj, EFL_UI_TEXT_EVENT_TEXT_SET_DONE, NULL); 2627 (obj, EFL_UI_TEXT_EVENT_TEXT_SET_DONE, NULL);
2628 return ECORE_CALLBACK_CANCEL; 2628 return ECORE_CALLBACK_CANCEL;
2629 } 2629 }
@@ -2783,7 +2783,7 @@ _entry_text_append(Evas_Object* obj, const char* entry, Eina_Bool set)
2783 } 2783 }
2784 edje_object_part_text_cursor_pos_set(sd->entry_edje, "elm.text", 2784 edje_object_part_text_cursor_pos_set(sd->entry_edje, "elm.text",
2785 EDJE_CURSOR_MAIN, sd->cursor_pos); 2785 EDJE_CURSOR_MAIN, sd->cursor_pos);
2786 efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_TEXT_SET_DONE, NULL); 2786 efl_event_callback_legacy_call(obj, EFL_UI_TEXT_EVENT_TEXT_SET_DONE, NULL);
2787 } 2787 }
2788 } 2788 }
2789} 2789}
@@ -3723,7 +3723,7 @@ _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
3723 edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); 3723 edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm");
3724 } 3724 }
3725 if (sd->have_selection) 3725 if (sd->have_selection)
3726 efl_event_callback_call 3726 efl_event_callback_legacy_call
3727 (obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL); 3727 (obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
3728 3728
3729 sd->have_selection = EINA_FALSE; 3729 sd->have_selection = EINA_FALSE;
@@ -3937,7 +3937,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
3937{ 3937{
3938 EFL_UI_TEXT_DATA_GET(obj, sd); 3938 EFL_UI_TEXT_DATA_GET(obj, sd);
3939 /* here we need to emit the signal that the elm_scroller would have done */ 3939 /* here we need to emit the signal that the elm_scroller would have done */
3940 efl_event_callback_call 3940 efl_event_callback_legacy_call
3941 (obj, EFL_UI_EVENT_SCROLL, NULL); 3941 (obj, EFL_UI_EVENT_SCROLL, NULL);
3942 3942
3943 if (sd->have_selection) 3943 if (sd->have_selection)
@@ -4283,7 +4283,7 @@ _efl_ui_text_elm_widget_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Elm
4283 if (!elm_widget_disabled_get(obj) && 4283 if (!elm_widget_disabled_get(obj) &&
4284 !evas_object_freeze_events_get(obj)) 4284 !evas_object_freeze_events_get(obj))
4285 { 4285 {
4286 efl_event_callback_call 4286 efl_event_callback_legacy_call
4287 (obj, EFL_UI_EVENT_CLICKED, NULL); 4287 (obj, EFL_UI_EVENT_CLICKED, NULL);
4288 if (sd->editable && sd->input_panel_enable) 4288 if (sd->editable && sd->input_panel_enable)
4289 edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text"); 4289 edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text");
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 1177bec033..76d0762e4e 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -65,7 +65,7 @@ static const Elm_Win_Trap *trap = NULL;
65 { \ 65 { \
66 edje_object_signal_emit(cursd->edje, \ 66 edje_object_signal_emit(cursd->edje, \
67 "elm,action,hide_blocker", "elm"); \ 67 "elm,action,hide_blocker", "elm"); \
68 efl_event_callback_call(cursd->main_menu, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL); \ 68 efl_event_callback_legacy_call(cursd->main_menu, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL); \
69 } \ 69 } \
70 } 70 }
71 71
@@ -81,7 +81,7 @@ static const Elm_Win_Trap *trap = NULL;
81 { \ 81 { \
82 edje_object_signal_emit(cursd->edje, \ 82 edje_object_signal_emit(cursd->edje, \
83 "elm,action,show_blocker", "elm"); \ 83 "elm,action,show_blocker", "elm"); \
84 efl_event_callback_call(cursd->main_menu, EFL_UI_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); \ 84 efl_event_callback_legacy_call(cursd->main_menu, EFL_UI_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); \
85 } \ 85 } \
86 } 86 }
87 87
@@ -840,7 +840,7 @@ _elm_win_move(Ecore_Evas *ee)
840 ecore_evas_geometry_get(ee, &x, &y, NULL, NULL); 840 ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
841 sd->screen.x = x; 841 sd->screen.x = x;
842 sd->screen.y = y; 842 sd->screen.y = y;
843 efl_event_callback_call(sd->obj, EFL_GFX_EVENT_MOVE, NULL); 843 efl_event_callback_legacy_call(sd->obj, EFL_GFX_EVENT_MOVE, NULL);
844 evas_nochange_push(evas_object_evas_get(sd->obj)); 844 evas_nochange_push(evas_object_evas_get(sd->obj));
845 sd->response++; 845 sd->response++;
846 evas_object_move(sd->obj, x, y); 846 evas_object_move(sd->obj, x, y);
@@ -1293,7 +1293,7 @@ _elm_win_profile_update(Efl_Ui_Win_Data *sd)
1293 EINA_LIST_FOREACH(sub, l, ee2) 1293 EINA_LIST_FOREACH(sub, l, ee2)
1294 ecore_evas_window_profile_set(ee2, sd->profile.name); 1294 ecore_evas_window_profile_set(ee2, sd->profile.name);
1295 1295
1296 efl_event_callback_call(sd->obj, EFL_UI_WIN_EVENT_PROFILE_CHANGED, NULL); 1296 efl_event_callback_legacy_call(sd->obj, EFL_UI_WIN_EVENT_PROFILE_CHANGED, NULL);
1297} 1297}
1298 1298
1299#ifdef HAVE_ELEMENTARY_WL2 1299#ifdef HAVE_ELEMENTARY_WL2
@@ -1446,16 +1446,16 @@ _elm_win_state_change(Ecore_Evas *ee)
1446 if ((ch_withdrawn) || (ch_iconified)) 1446 if ((ch_withdrawn) || (ch_iconified))
1447 { 1447 {
1448 if (sd->withdrawn) 1448 if (sd->withdrawn)
1449 efl_event_callback_call(obj, EFL_UI_WIN_EVENT_WITHDRAWN, NULL); 1449 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_WITHDRAWN, NULL);
1450 else if (sd->iconified) 1450 else if (sd->iconified)
1451 { 1451 {
1452 efl_event_callback_call(obj, EFL_UI_WIN_EVENT_ICONIFIED, NULL); 1452 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_ICONIFIED, NULL);
1453 if (_elm_config->atspi_mode) 1453 if (_elm_config->atspi_mode)
1454 elm_interface_atspi_window_minimized_signal_emit(obj); 1454 elm_interface_atspi_window_minimized_signal_emit(obj);
1455 } 1455 }
1456 else 1456 else
1457 { 1457 {
1458 efl_event_callback_call(obj, EFL_UI_WIN_EVENT_NORMAL, NULL); 1458 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_NORMAL, NULL);
1459 if (_elm_config->atspi_mode) 1459 if (_elm_config->atspi_mode)
1460 elm_interface_atspi_window_restored_signal_emit(obj); 1460 elm_interface_atspi_window_restored_signal_emit(obj);
1461 } 1461 }
@@ -1463,9 +1463,9 @@ _elm_win_state_change(Ecore_Evas *ee)
1463 if (ch_sticky) 1463 if (ch_sticky)
1464 { 1464 {
1465 if (sd->sticky) 1465 if (sd->sticky)
1466 efl_event_callback_call(obj, EFL_UI_WIN_EVENT_STICK, NULL); 1466 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_STICK, NULL);
1467 else 1467 else
1468 efl_event_callback_call(obj, EFL_UI_WIN_EVENT_UNSTICK, NULL); 1468 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_UNSTICK, NULL);
1469 } 1469 }
1470 if (ch_fullscreen) 1470 if (ch_fullscreen)
1471 { 1471 {
@@ -1489,7 +1489,7 @@ _elm_win_state_change(Ecore_Evas *ee)
1489 if (need_frame) 1489 if (need_frame)
1490 sd->wl.opaque_dirty = 1; 1490 sd->wl.opaque_dirty = 1;
1491#endif 1491#endif
1492 efl_event_callback_call 1492 efl_event_callback_legacy_call
1493 (obj, EFL_UI_WIN_EVENT_FULLSCREEN, NULL); 1493 (obj, EFL_UI_WIN_EVENT_FULLSCREEN, NULL);
1494 } 1494 }
1495 else 1495 else
@@ -1501,7 +1501,7 @@ _elm_win_state_change(Ecore_Evas *ee)
1501 _elm_win_frame_obj_update(sd); 1501 _elm_win_frame_obj_update(sd);
1502 } 1502 }
1503#endif 1503#endif
1504 efl_event_callback_call 1504 efl_event_callback_legacy_call
1505 (obj, EFL_UI_WIN_EVENT_UNFULLSCREEN, NULL); 1505 (obj, EFL_UI_WIN_EVENT_UNFULLSCREEN, NULL);
1506 } 1506 }
1507 } 1507 }
@@ -1509,13 +1509,13 @@ _elm_win_state_change(Ecore_Evas *ee)
1509 { 1509 {
1510 if (sd->maximized) 1510 if (sd->maximized)
1511 { 1511 {
1512 efl_event_callback_call(obj, EFL_UI_WIN_EVENT_MAXIMIZED, NULL); 1512 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_MAXIMIZED, NULL);
1513 if (_elm_config->atspi_mode) 1513 if (_elm_config->atspi_mode)
1514 elm_interface_atspi_window_maximized_signal_emit(obj); 1514 elm_interface_atspi_window_maximized_signal_emit(obj);
1515 } 1515 }
1516 else 1516 else
1517 { 1517 {
1518 efl_event_callback_call(obj, EFL_UI_WIN_EVENT_UNMAXIMIZED, NULL); 1518 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_UNMAXIMIZED, NULL);
1519 if (_elm_config->atspi_mode) 1519 if (_elm_config->atspi_mode)
1520 elm_interface_atspi_window_restored_signal_emit(obj); 1520 elm_interface_atspi_window_restored_signal_emit(obj);
1521 } 1521 }
@@ -1534,9 +1534,9 @@ _elm_win_state_change(Ecore_Evas *ee)
1534 _elm_win_xwin_update(sd); 1534 _elm_win_xwin_update(sd);
1535#endif 1535#endif
1536 elm_widget_orientation_set(obj, sd->rot); 1536 elm_widget_orientation_set(obj, sd->rot);
1537 efl_event_callback_call 1537 efl_event_callback_legacy_call
1538 (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL); 1538 (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL);
1539 efl_event_callback_call 1539 efl_event_callback_legacy_call
1540 (obj, EFL_UI_WIN_EVENT_WM_ROTATION_CHANGED, NULL); 1540 (obj, EFL_UI_WIN_EVENT_WM_ROTATION_CHANGED, NULL);
1541 } 1541 }
1542} 1542}
@@ -1678,7 +1678,7 @@ _evas_event_key_cb(void *data, const Eo_Event *ev)
1678 if (evas_focus_get(evas_object_evas_get(win)) == win) 1678 if (evas_focus_get(evas_object_evas_get(win)) == win)
1679 return; 1679 return;
1680 1680
1681 efl_event_callback_call(win, ev->desc, evt); 1681 efl_event_callback_legacy_call(win, ev->desc, evt);
1682} 1682}
1683 1683
1684static void 1684static void
@@ -1692,7 +1692,7 @@ _evas_event_pointer_cb(void *data, const Eo_Event *ev)
1692 if (!evdata || evdata->win_fed) 1692 if (!evdata || evdata->win_fed)
1693 return; 1693 return;
1694 1694
1695 efl_event_callback_call(win, ev->desc, evt); 1695 efl_event_callback_legacy_call(win, ev->desc, evt);
1696} 1696}
1697 1697
1698/* feed events from the window to evas - for fake inputs */ 1698/* feed events from the window to evas - for fake inputs */
@@ -1711,7 +1711,7 @@ _evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev)
1711 return; 1711 return;
1712 evdata->win_fed = EINA_TRUE; 1712 evdata->win_fed = EINA_TRUE;
1713 1713
1714 efl_event_callback_call(evas, ev->desc, evt); 1714 efl_event_callback_legacy_call(evas, ev->desc, evt);
1715 evdata->win_fed = EINA_FALSE; 1715 evdata->win_fed = EINA_FALSE;
1716 evdata->evas_done = EINA_FALSE; 1716 evdata->evas_done = EINA_FALSE;
1717} 1717}
@@ -1731,7 +1731,7 @@ _evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
1731 return; 1731 return;
1732 evdata->win_fed = EINA_TRUE; 1732 evdata->win_fed = EINA_TRUE;
1733 1733
1734 efl_event_callback_call(evas, ev->desc, evt); 1734 efl_event_callback_legacy_call(evas, ev->desc, evt);
1735 evdata->win_fed = EINA_FALSE; 1735 evdata->win_fed = EINA_FALSE;
1736 evdata->evas_done = EINA_FALSE; 1736 evdata->evas_done = EINA_FALSE;
1737} 1737}
@@ -1756,7 +1756,7 @@ _elm_win_evas_render_post(void *data,
1756 Efl_Gfx_Event_Render_Post *ev = event_info; 1756 Efl_Gfx_Event_Render_Post *ev = event_info;
1757 Eo *win = data; 1757 Eo *win = data;
1758 1758
1759 efl_event_callback_call(win, EFL_CANVAS_EVENT_RENDER_POST, ev); 1759 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_RENDER_POST, ev);
1760} 1760}
1761 1761
1762static void 1762static void
@@ -1768,7 +1768,7 @@ _elm_win_evas_render_pre(void *data,
1768 Eo *win = data; 1768 Eo *win = data;
1769 1769
1770 _elm_win_throttle_ok = EINA_TRUE; 1770 _elm_win_throttle_ok = EINA_TRUE;
1771 efl_event_callback_call(win, EFL_CANVAS_EVENT_RENDER_PRE, NULL); 1771 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_RENDER_PRE, NULL);
1772} 1772}
1773 1773
1774static void 1774static void
@@ -1780,7 +1780,7 @@ _elm_win_evas_focus_in(void *data,
1780 Eo *win = data; 1780 Eo *win = data;
1781 1781
1782 _elm_win_throttle_ok = EINA_TRUE; 1782 _elm_win_throttle_ok = EINA_TRUE;
1783 efl_event_callback_call(win, EFL_CANVAS_EVENT_FOCUS_IN, NULL); 1783 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_FOCUS_IN, NULL);
1784} 1784}
1785 1785
1786static void 1786static void
@@ -1791,7 +1791,7 @@ _elm_win_evas_focus_out(void *data,
1791{ 1791{
1792 Eo *win = data; 1792 Eo *win = data;
1793 1793
1794 efl_event_callback_call(win, EFL_CANVAS_EVENT_FOCUS_OUT, NULL); 1794 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_FOCUS_OUT, NULL);
1795} 1795}
1796 1796
1797static void 1797static void
@@ -1804,7 +1804,7 @@ _elm_win_evas_object_focus_in(void *data,
1804 Eo *win = data; 1804 Eo *win = data;
1805 1805
1806 _elm_win_throttle_ok = EINA_TRUE; 1806 _elm_win_throttle_ok = EINA_TRUE;
1807 efl_event_callback_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_IN, object); 1807 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_IN, object);
1808} 1808}
1809 1809
1810static void 1810static void
@@ -1816,7 +1816,7 @@ _elm_win_evas_object_focus_out(void *data,
1816 Eo *object = event_info; 1816 Eo *object = event_info;
1817 Eo *win = data; 1817 Eo *win = data;
1818 1818
1819 efl_event_callback_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT, object); 1819 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT, object);
1820} 1820}
1821 1821
1822static void 1822static void
@@ -1828,7 +1828,7 @@ _elm_win_evas_device_changed(void *data,
1828 Eo *device = event_info; 1828 Eo *device = event_info;
1829 Eo *win = data; 1829 Eo *win = data;
1830 1830
1831 efl_event_callback_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device); 1831 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device);
1832} 1832}
1833 1833
1834static void 1834static void
@@ -2594,7 +2594,7 @@ _efl_ui_win_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord
2594 { 2594 {
2595 sd->screen.x = x; 2595 sd->screen.x = x;
2596 sd->screen.y = y; 2596 sd->screen.y = y;
2597 efl_event_callback_call(obj, EFL_GFX_EVENT_MOVE, NULL); 2597 efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_MOVE, NULL);
2598 } 2598 }
2599 return; 2599 return;
2600 } 2600 }
@@ -2610,7 +2610,7 @@ _efl_ui_win_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord
2610 { 2610 {
2611 sd->screen.x = x; 2611 sd->screen.x = x;
2612 sd->screen.y = y; 2612 sd->screen.y = y;
2613 efl_event_callback_call(obj, EFL_GFX_EVENT_MOVE, NULL); 2613 efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_MOVE, NULL);
2614 } 2614 }
2615 if (sd->frame_obj) 2615 if (sd->frame_obj)
2616 { 2616 {
@@ -2664,7 +2664,7 @@ _elm_win_delete_request(Ecore_Evas *ee)
2664 int autodel = sd->autodel; 2664 int autodel = sd->autodel;
2665 sd->autodel_clear = &autodel; 2665 sd->autodel_clear = &autodel;
2666 evas_object_ref(obj); 2666 evas_object_ref(obj);
2667 efl_event_callback_call(obj, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL); 2667 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL);
2668 if (sd->autohide) 2668 if (sd->autohide)
2669 evas_object_hide(obj); 2669 evas_object_hide(obj);
2670 // FIXME: if above callback deletes - then the below will be invalid 2670 // FIXME: if above callback deletes - then the below will be invalid
@@ -3228,7 +3228,7 @@ _elm_win_property_change(void *data,
3228 if (e->win == sd->x.xwin) 3228 if (e->win == sd->x.xwin)
3229 { 3229 {
3230 sd->indmode = (Elm_Win_Indicator_Mode)ecore_x_e_illume_indicator_state_get(e->win); 3230 sd->indmode = (Elm_Win_Indicator_Mode)ecore_x_e_illume_indicator_state_get(e->win);
3231 efl_event_callback_call 3231 efl_event_callback_legacy_call
3232 (sd->obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL); 3232 (sd->obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
3233 } 3233 }
3234 } 3234 }
@@ -3589,7 +3589,7 @@ _elm_win_frame_cb_close(void *data,
3589 int autodel = sd->autodel; 3589 int autodel = sd->autodel;
3590 sd->autodel_clear = &autodel; 3590 sd->autodel_clear = &autodel;
3591 evas_object_ref(win); 3591 evas_object_ref(win);
3592 efl_event_callback_call(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL); 3592 efl_event_callback_legacy_call(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL);
3593 if (sd->autohide) 3593 if (sd->autohide)
3594 evas_object_hide(win); 3594 evas_object_hide(win);
3595 // FIXME: if above callback deletes - then the below will be invalid 3595 // FIXME: if above callback deletes - then the below will be invalid
@@ -3841,7 +3841,7 @@ _elm_x_io_err(void *data EINA_UNUSED)
3841 Evas_Object *obj; 3841 Evas_Object *obj;
3842 3842
3843 EINA_LIST_FOREACH(_elm_win_list, l, obj) 3843 EINA_LIST_FOREACH(_elm_win_list, l, obj)
3844 efl_event_callback_call(obj, EFL_UI_WIN_EVENT_IOERR, NULL); 3844 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_IOERR, NULL);
3845 elm_exit(); 3845 elm_exit();
3846} 3846}
3847#endif 3847#endif
@@ -5354,7 +5354,7 @@ _win_rotate(Evas_Object *obj, Efl_Ui_Win_Data *sd, int rotation, Eina_Bool resiz
5354#endif 5354#endif
5355 _elm_win_frame_obj_update(sd); 5355 _elm_win_frame_obj_update(sd);
5356 elm_widget_orientation_set(obj, rotation); 5356 elm_widget_orientation_set(obj, rotation);
5357 efl_event_callback_call 5357 efl_event_callback_legacy_call
5358 (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL); 5358 (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL);
5359} 5359}
5360 5360
@@ -5610,7 +5610,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
5610 edje_object_scale_set(sd->edje, 5610 edje_object_scale_set(sd->edje,
5611 elm_widget_scale_get(obj) * elm_config_scale_get()); 5611 elm_widget_scale_get(obj) * elm_config_scale_get());
5612 5612
5613 efl_event_callback_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL); 5613 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL);
5614 ret = elm_obj_widget_disable(obj); 5614 ret = elm_obj_widget_disable(obj);
5615 5615
5616 if (!ret) int_ret = ELM_THEME_APPLY_FAILED; 5616 if (!ret) int_ret = ELM_THEME_APPLY_FAILED;
@@ -6297,7 +6297,7 @@ elm_win_indicator_mode_set(Evas_Object *obj, Elm_Win_Indicator_Mode mode)
6297 (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF); 6297 (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF);
6298 } 6298 }
6299#endif 6299#endif
6300 efl_event_callback_call 6300 efl_event_callback_legacy_call
6301 (obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL); 6301 (obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
6302} 6302}
6303 6303
@@ -6333,7 +6333,7 @@ elm_win_indicator_opacity_set(Evas_Object *obj, Elm_Win_Indicator_Opacity_Mode m
6333 (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_TRANSPARENT); 6333 (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_TRANSPARENT);
6334 } 6334 }
6335#endif 6335#endif
6336 efl_event_callback_call 6336 efl_event_callback_legacy_call
6337 (obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL); 6337 (obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
6338} 6338}
6339 6339
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index c545193268..6fec7a7d5e 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -119,7 +119,7 @@ _hover_end_finished(void *data,
119 { 119 {
120 sd->expanded = EINA_FALSE; 120 sd->expanded = EINA_FALSE;
121 evas_object_hide(sd->hover); 121 evas_object_hide(sd->hover);
122 efl_event_callback_call(data, ELM_COMBOBOX_EVENT_DISMISSED, NULL); 122 efl_event_callback_legacy_call(data, ELM_COMBOBOX_EVENT_DISMISSED, NULL);
123 } 123 }
124} 124}
125 125
@@ -194,7 +194,7 @@ _activate(Evas_Object *obj)
194 evas_object_show(sd->genlist); 194 evas_object_show(sd->genlist);
195 elm_genlist_item_selected_set(sd->item, EINA_TRUE); 195 elm_genlist_item_selected_set(sd->item, EINA_TRUE);
196 evas_object_show(sd->hover); 196 evas_object_show(sd->hover);
197 efl_event_callback_call(obj, ELM_COMBOBOX_EVENT_EXPANDED, NULL); 197 efl_event_callback_legacy_call(obj, ELM_COMBOBOX_EVENT_EXPANDED, NULL);
198} 198}
199 199
200static void 200static void
@@ -203,13 +203,13 @@ _on_item_selected(void *data , Evas_Object *obj EINA_UNUSED, void *event)
203 ELM_COMBOBOX_DATA_GET(data, sd); 203 ELM_COMBOBOX_DATA_GET(data, sd);
204 elm_object_focus_set(sd->entry, EINA_TRUE); 204 elm_object_focus_set(sd->entry, EINA_TRUE);
205 205
206 efl_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_SELECTED, event); 206 efl_event_callback_legacy_call(data, ELM_COMBOBOX_EVENT_ITEM_SELECTED, event);
207} 207}
208 208
209static void 209static void
210_on_item_pressed(void *data , Evas_Object *obj EINA_UNUSED, void *event) 210_on_item_pressed(void *data , Evas_Object *obj EINA_UNUSED, void *event)
211{ 211{
212 efl_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_PRESSED, event); 212 efl_event_callback_legacy_call(data, ELM_COMBOBOX_EVENT_ITEM_PRESSED, event);
213} 213}
214 214
215static void 215static void
@@ -226,7 +226,7 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event)
226 return; 226 return;
227 } 227 }
228 228
229 efl_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info); 229 efl_event_callback_legacy_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info);
230 230
231 if (sd->count > 0) 231 if (sd->count > 0)
232 { 232 {
@@ -254,7 +254,7 @@ _on_aborted(void *data, const Eo_Event *event EINA_UNUSED)
254static void 254static void
255_on_changed(void *data, const Eo_Event *event EINA_UNUSED) 255_on_changed(void *data, const Eo_Event *event EINA_UNUSED)
256{ 256{
257 efl_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED, NULL); 257 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CHANGED, NULL);
258} 258}
259 259
260static void 260static void
@@ -415,7 +415,7 @@ _elm_combobox_hover_end(Eo *obj, Elm_Combobox_Data *sd)
415 { 415 {
416 sd->expanded = EINA_FALSE; 416 sd->expanded = EINA_FALSE;
417 evas_object_hide(sd->hover); 417 evas_object_hide(sd->hover);
418 efl_event_callback_call(obj, ELM_COMBOBOX_EVENT_DISMISSED, NULL); 418 efl_event_callback_legacy_call(obj, ELM_COMBOBOX_EVENT_DISMISSED, NULL);
419 } // for backward compatibility 419 } // for backward compatibility
420} 420}
421 421
@@ -461,7 +461,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
461 elm_combobox_hover_begin(obj); 461 elm_combobox_hover_begin(obj);
462 else 462 else
463 { 463 {
464 efl_event_callback_call(sd->genlist, EFL_UI_EVENT_PRESSED, sd->item); 464 efl_event_callback_legacy_call(sd->genlist, EFL_UI_EVENT_PRESSED, sd->item);
465 elm_entry_cursor_end_set(sd->entry); 465 elm_entry_cursor_end_set(sd->entry);
466 } 466 }
467 return EINA_TRUE; 467 return EINA_TRUE;
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 6fcebde16d..05a62b07cf 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -670,7 +670,7 @@ _elm_ctxpopup_elm_layout_sizing_eval(Eo *obj, Elm_Ctxpopup_Data *sd)
670 670
671 _show_signals_emit(obj, sd->dir); 671 _show_signals_emit(obj, sd->dir);
672 672
673 efl_event_callback_call(obj, ELM_CTXPOPUP_EVENT_GEOMETRY_UPDATE, &rect); 673 efl_event_callback_legacy_call(obj, ELM_CTXPOPUP_EVENT_GEOMETRY_UPDATE, &rect);
674} 674}
675 675
676static void 676static void
@@ -708,7 +708,7 @@ _on_parent_resize(void *data,
708 sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN; 708 sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
709 709
710 evas_object_hide(data); 710 evas_object_hide(data);
711 efl_event_callback_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL); 711 efl_event_callback_legacy_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL);
712 } 712 }
713 else 713 else
714 { 714 {
@@ -1011,7 +1011,7 @@ _hide_finished_cb(void *data,
1011 const char *source EINA_UNUSED) 1011 const char *source EINA_UNUSED)
1012{ 1012{
1013 evas_object_hide(data); 1013 evas_object_hide(data);
1014 efl_event_callback_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL); 1014 efl_event_callback_legacy_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL);
1015} 1015}
1016 1016
1017static void 1017static void
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 0cf92b7207..414bb85c25 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -624,7 +624,7 @@ _signal_first(Listing_Request *lreq)
624 } 624 }
625 625
626 // EVENTS: should not call legacy 626 // EVENTS: should not call legacy
627 //efl_event_callback_call 627 //efl_event_callback_legacy_call
628 // (lreq->obj, ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN, (void *)lreq->model); 628 // (lreq->obj, ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN, (void *)lreq->model);
629 629
630 evas_object_smart_callback_call(lreq->obj, "directory,open", (void *)lreq->path); 630 evas_object_smart_callback_call(lreq->obj, "directory,open", (void *)lreq->path);
@@ -1052,7 +1052,7 @@ _on_item_activated(void *data, const Eo_Event *event)
1052 if (!it_data->is_dir) 1052 if (!it_data->is_dir)
1053 { 1053 {
1054 // EVENTS: should not call legacy 1054 // EVENTS: should not call legacy
1055 //efl_event_callback_call 1055 //efl_event_callback_legacy_call
1056 // (data, ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)it_data->model); 1056 // (data, ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)it_data->model);
1057 evas_object_smart_callback_call(data, "activated", (void *)it_data->path); 1057 evas_object_smart_callback_call(data, "activated", (void *)it_data->path);
1058 return; 1058 return;
@@ -1138,7 +1138,7 @@ _on_item_selected(void *data, const Eo_Event *event)
1138 elm_object_text_set(sd->name_entry, it_data->filename); 1138 elm_object_text_set(sd->name_entry, it_data->filename);
1139 1139
1140 // EVENTS: should not call legacy 1140 // EVENTS: should not call legacy
1141 //efl_event_callback_call 1141 //efl_event_callback_legacy_call
1142 // (data, EFL_UI_EVENT_SELECTED, (void *)it_data->model); 1142 // (data, EFL_UI_EVENT_SELECTED, (void *)it_data->model);
1143 evas_object_smart_callback_call(data, "selected", (void *)it_data->path); 1143 evas_object_smart_callback_call(data, "selected", (void *)it_data->path);
1144 } 1144 }
@@ -1282,7 +1282,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
1282 if (!sd->model || !sd->path) 1282 if (!sd->model || !sd->path)
1283 { 1283 {
1284 // EVENTS: should not call legacy 1284 // EVENTS: should not call legacy
1285 //efl_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL); 1285 //efl_event_callback_legacy_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
1286 evas_object_smart_callback_call(fs, "done", NULL); 1286 evas_object_smart_callback_call(fs, "done", NULL);
1287 return; 1287 return;
1288 } 1288 }
@@ -1301,7 +1301,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
1301 _model_str_property_set(selected_model, "path", selection, NULL); 1301 _model_str_property_set(selected_model, "path", selection, NULL);
1302 1302
1303 // EVENTS: should not call legacy 1303 // EVENTS: should not call legacy
1304 //efl_event_callback_call 1304 //efl_event_callback_legacy_call
1305 // (fs, ELM_FILESELECTOR_EVENT_DONE, selected_model); 1305 // (fs, ELM_FILESELECTOR_EVENT_DONE, selected_model);
1306 evas_object_smart_callback_call(fs, "done", (void *) selection); 1306 evas_object_smart_callback_call(fs, "done", (void *) selection);
1307 1307
@@ -1314,12 +1314,12 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
1314 if (it_data) 1314 if (it_data)
1315 { 1315 {
1316 // EVENTS: should not call legacy 1316 // EVENTS: should not call legacy
1317 //efl_event_callback_call 1317 //efl_event_callback_legacy_call
1318 // (fs, ELM_FILESELECTOR_EVENT_DONE, it_data->model); 1318 // (fs, ELM_FILESELECTOR_EVENT_DONE, it_data->model);
1319 evas_object_smart_callback_call(fs, "done", (void *) it_data->path); 1319 evas_object_smart_callback_call(fs, "done", (void *) it_data->path);
1320 } 1320 }
1321 // EVENTS: should not call legacy 1321 // EVENTS: should not call legacy
1322 //efl_event_callback_call 1322 //efl_event_callback_legacy_call
1323 // (fs, ELM_FILESELECTOR_EVENT_DONE, sd->model); 1323 // (fs, ELM_FILESELECTOR_EVENT_DONE, sd->model);
1324 evas_object_smart_callback_call(fs, "done", (void *) sd->path); 1324 evas_object_smart_callback_call(fs, "done", (void *) sd->path);
1325 } 1325 }
@@ -1331,7 +1331,7 @@ _canc(void *data, const Eo_Event *event EINA_UNUSED)
1331 Evas_Object *fs = data; 1331 Evas_Object *fs = data;
1332 1332
1333 // EVENTS: should not call legacy 1333 // EVENTS: should not call legacy
1334 //efl_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL); 1334 //efl_event_callback_legacy_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
1335 evas_object_smart_callback_call(fs, "done", NULL); 1335 evas_object_smart_callback_call(fs, "done", NULL);
1336} 1336}
1337 1337
@@ -1368,7 +1368,7 @@ _text_activated_is_dir_then(void *data, void *value)
1368 if (sd->only_folder) 1368 if (sd->only_folder)
1369 { 1369 {
1370 // EVENTS: should not call legacy 1370 // EVENTS: should not call legacy
1371 //efl_event_callback_call 1371 //efl_event_callback_legacy_call
1372 // (fs, EFL_UI_EVENT_SELECTED, (void *)model); 1372 // (fs, EFL_UI_EVENT_SELECTED, (void *)model);
1373 evas_object_smart_callback_call(fs, "selected", (void *) str); 1373 evas_object_smart_callback_call(fs, "selected", (void *) str);
1374 } 1374 }
@@ -1387,7 +1387,7 @@ _text_activated_is_dir_then(void *data, void *value)
1387 if (sd->only_folder) 1387 if (sd->only_folder)
1388 { 1388 {
1389 // EVENTS: should not call legacy 1389 // EVENTS: should not call legacy
1390 //efl_event_callback_call 1390 //efl_event_callback_legacy_call
1391 // (fs, EFL_UI_EVENT_SELECTED, (void *)model); 1391 // (fs, EFL_UI_EVENT_SELECTED, (void *)model);
1392 evas_object_smart_callback_call(fs, "selected", (void *) str); 1392 evas_object_smart_callback_call(fs, "selected", (void *) str);
1393 } 1393 }
@@ -1426,12 +1426,12 @@ _on_text_activated_set_path_then_error(void *data, Eina_Error err EINA_UNUSED)
1426 Eina_Stringshare *str = efl_key_data_get(fs, _text_activated_path_key); 1426 Eina_Stringshare *str = efl_key_data_get(fs, _text_activated_path_key);
1427 1427
1428 // EVENTS: should not call legacy 1428 // EVENTS: should not call legacy
1429 //efl_event_callback_call 1429 //efl_event_callback_legacy_call
1430 // (fs, EFL_UI_EVENT_SELECTED, (void *)model); 1430 // (fs, EFL_UI_EVENT_SELECTED, (void *)model);
1431 evas_object_smart_callback_call(fs, "selected", (void *)str); 1431 evas_object_smart_callback_call(fs, "selected", (void *)str);
1432 1432
1433 // EVENTS: should not call legacy 1433 // EVENTS: should not call legacy
1434 //efl_event_callback_call 1434 //efl_event_callback_legacy_call
1435 // (fs, ELM_FILESELECTOR_EVENT_SELECTED_INVALID, (void *)model); 1435 // (fs, ELM_FILESELECTOR_EVENT_SELECTED_INVALID, (void *)model);
1436 evas_object_smart_callback_call(fs, "selected,invalid", (void *)str); 1436 evas_object_smart_callback_call(fs, "selected,invalid", (void *)str);
1437 1437
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 9507ad3cdd..f7a173bf53 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -107,7 +107,7 @@ _selection_done(void *data, const Eo_Event *event)
107 evas_object_del(del); 107 evas_object_del(del);
108 108
109 // EVENTS: should not call legacy 109 // EVENTS: should not call legacy
110 //efl_event_callback_call 110 //efl_event_callback_legacy_call
111 // (sd->obj, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN, (void *)model); 111 // (sd->obj, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN, (void *)model);
112} 112}
113 113
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 8af305e653..bb189792ba 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -49,7 +49,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
49 static void \ 49 static void \
50 _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \ 50 _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \
51 { \ 51 { \
52 efl_event_callback_call(data, event, ev->info); \ 52 efl_event_callback_legacy_call(data, event, ev->info); \
53 } 53 }
54SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED) 54SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED)
55SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS) 55SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
@@ -94,7 +94,7 @@ _FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
94 eina_promise_then(promise, _file_chosen_path_then, NULL, data); 94 eina_promise_then(promise, _file_chosen_path_then, NULL, data);
95 95
96 // EVENTS: should not call legacy 96 // EVENTS: should not call legacy
97 //efl_event_callback_call 97 //efl_event_callback_legacy_call
98 // (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->info); 98 // (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->info);
99} 99}
100 100
@@ -132,7 +132,7 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
132 elm_interface_fileselector_model_set(sd->button, model); 132 elm_interface_fileselector_model_set(sd->button, model);
133 } 133 }
134 134
135 efl_event_callback_call 135 efl_event_callback_legacy_call
136 (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->info); 136 (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->info);
137} 137}
138 138
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index fc9ed810f5..d9495ccafe 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -161,7 +161,7 @@ _on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
161 ELM_HOVERSEL_DATA_GET(obj2, sd); 161 ELM_HOVERSEL_DATA_GET(obj2, sd);
162 162
163 if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it); 163 if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it);
164 efl_event_callback_call(obj2, EFL_UI_EVENT_SELECTED, eo_it); 164 efl_event_callback_legacy_call(obj2, EFL_UI_EVENT_SELECTED, eo_it);
165 165
166 evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item); 166 evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item);
167 167
@@ -173,7 +173,7 @@ _item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
173{ 173{
174 Elm_Hoversel_Item_Data *it = data; 174 Elm_Hoversel_Item_Data *it = data;
175 175
176 efl_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it)); 176 efl_event_callback_legacy_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it));
177} 177}
178 178
179static void 179static void
@@ -181,7 +181,7 @@ _item_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
181{ 181{
182 Elm_Hoversel_Item_Data *it = data; 182 Elm_Hoversel_Item_Data *it = data;
183 183
184 efl_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it)); 184 efl_event_callback_legacy_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
185} 185}
186 186
187static void 187static void
@@ -349,7 +349,7 @@ _hover_del(Evas_Object *obj)
349 sd->scr = NULL; 349 sd->scr = NULL;
350 sd->last_location = NULL; 350 sd->last_location = NULL;
351 351
352 efl_event_callback_call(obj, ELM_HOVERSEL_EVENT_DISMISSED, NULL); 352 efl_event_callback_legacy_call(obj, ELM_HOVERSEL_EVENT_DISMISSED, NULL);
353} 353}
354 354
355static void 355static void
@@ -429,7 +429,7 @@ _activate(Evas_Object *obj)
429 _resizing_eval(obj, sd); 429 _resizing_eval(obj, sd);
430 elm_object_part_content_set(sd->hover, sd->last_location, sd->tbl); 430 elm_object_part_content_set(sd->hover, sd->last_location, sd->tbl);
431 431
432 efl_event_callback_call(obj, ELM_HOVERSEL_EVENT_EXPANDED, NULL); 432 efl_event_callback_legacy_call(obj, ELM_HOVERSEL_EVENT_EXPANDED, NULL);
433 evas_object_show(sd->hover); 433 evas_object_show(sd->hover);
434} 434}
435 435
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index dd1a9e4270..a1d9e8b89b 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -264,7 +264,7 @@ _shrink_mode_set(Evas_Object *obj,
264 evas_object_show(sd->end); 264 evas_object_show(sd->end);
265 265
266 sd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK; 266 sd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK;
267 efl_event_callback_call 267 efl_event_callback_legacy_call
268 (obj, ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)1); 268 (obj, ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)1);
269 break; 269 break;
270 } 270 }
@@ -297,7 +297,7 @@ _shrink_mode_set(Evas_Object *obj,
297 } 297 }
298 298
299 sd->view_state = MULTIBUTTONENTRY_VIEW_NONE; 299 sd->view_state = MULTIBUTTONENTRY_VIEW_NONE;
300 efl_event_callback_call 300 efl_event_callback_legacy_call
301 (obj, ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)(uintptr_t)sd->shrink); 301 (obj, ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)(uintptr_t)sd->shrink);
302 } 302 }
303 303
@@ -353,7 +353,7 @@ _elm_multibuttonentry_elm_widget_on_focus(Eo *obj, Elm_Multibuttonentry_Data *sd
353 elm_entry_input_panel_show(sd->entry); 353 elm_entry_input_panel_show(sd->entry);
354 } 354 }
355 } 355 }
356 efl_event_callback_call 356 efl_event_callback_legacy_call
357 (obj, ELM_WIDGET_EVENT_FOCUSED, NULL); 357 (obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
358 } 358 }
359 else 359 else
@@ -363,7 +363,7 @@ _elm_multibuttonentry_elm_widget_on_focus(Eo *obj, Elm_Multibuttonentry_Data *sd
363 _view_update(sd); 363 _view_update(sd);
364 elm_entry_input_panel_hide(sd->entry); 364 elm_entry_input_panel_hide(sd->entry);
365 } 365 }
366 efl_event_callback_call 366 efl_event_callback_legacy_call
367 (obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL); 367 (obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
368 } 368 }
369 369
@@ -380,7 +380,7 @@ _item_del(Elm_Multibuttonentry_Item_Data *item)
380 380
381 elm_box_unpack(sd->box, VIEW(item)); 381 elm_box_unpack(sd->box, VIEW(item));
382 382
383 efl_event_callback_call 383 efl_event_callback_legacy_call
384 (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_DELETED, EO_OBJ(item)); 384 (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_DELETED, EO_OBJ(item));
385 385
386 if (sd->selected_it == item) 386 if (sd->selected_it == item)
@@ -409,7 +409,7 @@ _current_item_state_change(Evas_Object *obj,
409 { 409 {
410 case MULTIBUTTONENTRY_BUTTON_STATE_SELECTED: 410 case MULTIBUTTONENTRY_BUTTON_STATE_SELECTED:
411 elm_layout_signal_emit(VIEW(item), "elm,state,focused", "elm"); 411 elm_layout_signal_emit(VIEW(item), "elm,state,focused", "elm");
412 efl_event_callback_call 412 efl_event_callback_legacy_call
413 (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_SELECTED, EO_OBJ(item)); 413 (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_SELECTED, EO_OBJ(item));
414 break; 414 break;
415 case MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT: 415 case MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT:
@@ -508,7 +508,7 @@ _on_item_clicked(void *data,
508 _item_select(WIDGET(it), it); 508 _item_select(WIDGET(it), it);
509 509
510 if (sd->selected_it) 510 if (sd->selected_it)
511 efl_event_callback_call 511 efl_event_callback_legacy_call
512 (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_CLICKED, eo_it); 512 (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_CLICKED, eo_it);
513} 513}
514 514
@@ -557,7 +557,7 @@ _long_press_cb(void *data)
557 557
558 sd->longpress_timer = NULL; 558 sd->longpress_timer = NULL;
559 559
560 efl_event_callback_call 560 efl_event_callback_legacy_call
561 (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, EO_OBJ(it)); 561 (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, EO_OBJ(it));
562 562
563 return ECORE_CALLBACK_CANCEL; 563 return ECORE_CALLBACK_CANCEL;
@@ -917,7 +917,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
917 break; 917 break;
918 } 918 }
919 919
920 efl_event_callback_call 920 efl_event_callback_legacy_call
921 (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED, eo_item); 921 (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED, eo_item);
922 922
923 if (_elm_config->atspi_mode) 923 if (_elm_config->atspi_mode)
@@ -965,7 +965,7 @@ _mouse_clicked_signal_cb(void *data EINA_UNUSED,
965 const char *emission EINA_UNUSED, 965 const char *emission EINA_UNUSED,
966 const char *source EINA_UNUSED) 966 const char *source EINA_UNUSED)
967{ 967{
968 efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL); 968 efl_event_callback_legacy_call(obj, EFL_UI_EVENT_CLICKED, NULL);
969} 969}
970 970
971static void 971static void
@@ -985,10 +985,10 @@ _box_resize_cb(void *data,
985 elm_box_padding_get(obj, &hpad, NULL); 985 elm_box_padding_get(obj, &hpad, NULL);
986 986
987 if (sd->h_box < h) 987 if (sd->h_box < h)
988 efl_event_callback_call 988 efl_event_callback_legacy_call
989 (sd->parent, ELM_MULTIBUTTONENTRY_EVENT_EXPANDED, NULL); 989 (sd->parent, ELM_MULTIBUTTONENTRY_EVENT_EXPANDED, NULL);
990 else if (sd->h_box > h) 990 else if (sd->h_box > h)
991 efl_event_callback_call 991 efl_event_callback_legacy_call
992 (sd->parent, ELM_MULTIBUTTONENTRY_EVENT_CONTRACTED, NULL); 992 (sd->parent, ELM_MULTIBUTTONENTRY_EVENT_CONTRACTED, NULL);
993 993
994 if (sd->items && sd->w_box != w) 994 if (sd->items && sd->w_box != w)
@@ -2033,7 +2033,7 @@ static Eina_Bool
2033_key_action_longpress(Eo *obj, const char *params EINA_UNUSED) 2033_key_action_longpress(Eo *obj, const char *params EINA_UNUSED)
2034{ 2034{
2035 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(obj, it); 2035 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(obj, it);
2036 efl_event_callback_call 2036 efl_event_callback_legacy_call
2037 (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, obj); 2037 (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, obj);
2038 return EINA_TRUE; 2038 return EINA_TRUE;
2039} 2039}
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index a4a54b10a7..5e85567f82 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -344,7 +344,7 @@ _on_item_title_transition_finished(void *data,
344{ 344{
345 Elm_Naviframe_Item_Data *it = data; 345 Elm_Naviframe_Item_Data *it = data;
346 346
347 efl_event_callback_call 347 efl_event_callback_legacy_call
348 (WIDGET(it), ELM_NAVIFRAME_EVENT_TITLE_TRANSITION_FINISHED, EO_OBJ(it)); 348 (WIDGET(it), ELM_NAVIFRAME_EVENT_TITLE_TRANSITION_FINISHED, EO_OBJ(it));
349} 349}
350 350
@@ -1089,7 +1089,7 @@ _on_item_title_clicked(void *data,
1089{ 1089{
1090 Elm_Naviframe_Item_Data *it = data; 1090 Elm_Naviframe_Item_Data *it = data;
1091 1091
1092 efl_event_callback_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TITLE_CLICKED, EO_OBJ(it)); 1092 efl_event_callback_legacy_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TITLE_CLICKED, EO_OBJ(it));
1093} 1093}
1094 1094
1095/* "elm,state,cur,pushed" 1095/* "elm,state,cur,pushed"
@@ -1155,7 +1155,7 @@ _on_item_show_finished(void *data,
1155 1155
1156 it->pushing = EINA_FALSE; 1156 it->pushing = EINA_FALSE;
1157 1157
1158 efl_event_callback_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TRANSITION_FINISHED, EO_OBJ(it)); 1158 efl_event_callback_legacy_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TRANSITION_FINISHED, EO_OBJ(it));
1159} 1159}
1160 1160
1161static void 1161static void
@@ -1491,7 +1491,7 @@ _key_action_top_item_get(Evas_Object *obj, const char *params EINA_UNUSED)
1491 ///Leave for compatibility. 1491 ///Leave for compatibility.
1492 ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it); 1492 ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it);
1493 if (it->title_prev_btn) 1493 if (it->title_prev_btn)
1494 efl_event_callback_call(it->title_prev_btn, EFL_UI_EVENT_CLICKED, NULL); 1494 efl_event_callback_legacy_call(it->title_prev_btn, EFL_UI_EVENT_CLICKED, NULL);
1495 1495
1496 return EINA_TRUE; 1496 return EINA_TRUE;
1497} 1497}
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index cd6343676e..0714ac4272 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -315,21 +315,21 @@ _forward(void *data, const Eo_Event *event EINA_UNUSED)
315 elm_video_play_position_set(sd->video, pos); 315 elm_video_play_position_set(sd->video, pos);
316 316
317 elm_layout_signal_emit(data, "elm,button,forward", "elm"); 317 elm_layout_signal_emit(data, "elm,button,forward", "elm");
318 efl_event_callback_call(data, ELM_PLAYER_EVENT_FORWARD_CLICKED, NULL); 318 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_FORWARD_CLICKED, NULL);
319} 319}
320 320
321static void 321static void
322_info(void *data, const Eo_Event *event EINA_UNUSED) 322_info(void *data, const Eo_Event *event EINA_UNUSED)
323{ 323{
324 elm_layout_signal_emit(data, "elm,button,info", "elm"); 324 elm_layout_signal_emit(data, "elm,button,info", "elm");
325 efl_event_callback_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL); 325 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL);
326} 326}
327 327
328static void 328static void
329_next(void *data, const Eo_Event *event EINA_UNUSED) 329_next(void *data, const Eo_Event *event EINA_UNUSED)
330{ 330{
331 elm_layout_signal_emit(data, "elm,button,next", "elm"); 331 elm_layout_signal_emit(data, "elm,button,next", "elm");
332 efl_event_callback_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL); 332 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL);
333} 333}
334 334
335static void 335static void
@@ -339,7 +339,7 @@ _pause(void *data, const Eo_Event *event EINA_UNUSED)
339 339
340 elm_layout_signal_emit(data, "elm,player,pause", "elm"); 340 elm_layout_signal_emit(data, "elm,player,pause", "elm");
341 elm_video_pause(sd->video); 341 elm_video_pause(sd->video);
342 efl_event_callback_call(data, ELM_PLAYER_EVENT_PAUSE_CLICKED, NULL); 342 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_PAUSE_CLICKED, NULL);
343} 343}
344 344
345static void 345static void
@@ -349,13 +349,13 @@ _play(void *data, const Eo_Event *event EINA_UNUSED)
349 349
350 elm_layout_signal_emit(data, "elm,player,play", "elm"); 350 elm_layout_signal_emit(data, "elm,player,play", "elm");
351 elm_video_play(sd->video); 351 elm_video_play(sd->video);
352 efl_event_callback_call(data, ELM_PLAYER_EVENT_PLAY_CLICKED, NULL); 352 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_PLAY_CLICKED, NULL);
353} 353}
354 354
355static void 355static void
356_prev(void *data, const Eo_Event *event EINA_UNUSED) 356_prev(void *data, const Eo_Event *event EINA_UNUSED)
357{ 357{
358 efl_event_callback_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL); 358 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL);
359 elm_layout_signal_emit(data, "elm,button,prev", "elm"); 359 elm_layout_signal_emit(data, "elm,button,prev", "elm");
360} 360}
361 361
@@ -371,14 +371,14 @@ _rewind(void *data, const Eo_Event *event EINA_UNUSED)
371 elm_video_play_position_set(sd->video, pos); 371 elm_video_play_position_set(sd->video, pos);
372 372
373 elm_layout_signal_emit(data, "elm,button,rewind", "elm"); 373 elm_layout_signal_emit(data, "elm,button,rewind", "elm");
374 efl_event_callback_call(data, ELM_PLAYER_EVENT_REWIND_CLICKED, NULL); 374 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_REWIND_CLICKED, NULL);
375} 375}
376 376
377static void 377static void
378_stop(void *data, const Eo_Event *event EINA_UNUSED) 378_stop(void *data, const Eo_Event *event EINA_UNUSED)
379{ 379{
380 elm_layout_signal_emit(data, "elm,button,stop", "elm"); 380 elm_layout_signal_emit(data, "elm,button,stop", "elm");
381 efl_event_callback_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL); 381 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL);
382} 382}
383 383
384static void 384static void
@@ -388,7 +388,7 @@ _eject(void *data, const Eo_Event *event EINA_UNUSED)
388 388
389 elm_layout_signal_emit(data, "elm,button,eject", "elm"); 389 elm_layout_signal_emit(data, "elm,button,eject", "elm");
390 emotion_object_eject(elm_video_emotion_get(sd->video)); 390 emotion_object_eject(elm_video_emotion_get(sd->video));
391 efl_event_callback_call(data, ELM_PLAYER_EVENT_EJECT_CLICKED, NULL); 391 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_EJECT_CLICKED, NULL);
392} 392}
393 393
394static void 394static void
@@ -413,7 +413,7 @@ _volume(void *data, const Eo_Event *event EINA_UNUSED)
413{ 413{
414 elm_layout_signal_emit(data, "elm,button,volume", "elm"); 414 elm_layout_signal_emit(data, "elm,button,volume", "elm");
415 _mute_toggle(data); 415 _mute_toggle(data);
416 efl_event_callback_call(data, ELM_PLAYER_EVENT_VOLUME_CLICKED, NULL); 416 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_VOLUME_CLICKED, NULL);
417} 417}
418 418
419static void 419static void
@@ -421,7 +421,7 @@ _mute(void *data, const Eo_Event *event EINA_UNUSED)
421{ 421{
422 elm_layout_signal_emit(data, "elm,button,mute", "elm"); 422 elm_layout_signal_emit(data, "elm,button,mute", "elm");
423 _mute_toggle(data); 423 _mute_toggle(data);
424 efl_event_callback_call(data, ELM_PLAYER_EVENT_MUTE_CLICKED, NULL); 424 efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_MUTE_CLICKED, NULL);
425} 425}
426 426
427static void 427static void
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 9fc6839a95..b2a1029c36 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -104,20 +104,20 @@ _visuals_set(Evas_Object *obj)
104static void 104static void
105_block_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 105_block_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
106{ 106{
107 efl_event_callback_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL); 107 efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
108} 108}
109 109
110static void 110static void
111_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED) 111_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
112{ 112{
113 evas_object_hide(data); 113 evas_object_hide(data);
114 efl_event_callback_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL); 114 efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL);
115} 115}
116 116
117static void 117static void
118_hide_effect_finished_cb(void *data, const Eo_Event *event EINA_UNUSED) 118_hide_effect_finished_cb(void *data, const Eo_Event *event EINA_UNUSED)
119{ 119{
120 efl_event_callback_call(data, ELM_POPUP_EVENT_DISMISSED, NULL); 120 efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_DISMISSED, NULL);
121} 121}
122 122
123 123
@@ -883,7 +883,7 @@ _item_focused_cb(void *data, const Eo_Event *event EINA_UNUSED)
883{ 883{
884 Elm_Popup_Item_Data *it = data; 884 Elm_Popup_Item_Data *it = data;
885 885
886 efl_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_FOCUSED, EO_OBJ(it)); 886 efl_event_callback_legacy_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_FOCUSED, EO_OBJ(it));
887} 887}
888 888
889static void 889static void
@@ -891,7 +891,7 @@ _item_unfocused_cb(void *data, const Eo_Event *event EINA_UNUSED)
891{ 891{
892 Elm_Popup_Item_Data *it = data; 892 Elm_Popup_Item_Data *it = data;
893 893
894 efl_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_UNFOCUSED, EO_OBJ(it)); 894 efl_event_callback_legacy_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
895} 895}
896 896
897EOLIAN static Eo * 897EOLIAN static Eo *
@@ -1855,7 +1855,7 @@ _elm_popup_class_constructor(Efl_Class *klass)
1855static Eina_Bool 1855static Eina_Bool
1856_action_dismiss(Evas_Object *obj, const char *params EINA_UNUSED) 1856_action_dismiss(Evas_Object *obj, const char *params EINA_UNUSED)
1857{ 1857{
1858 efl_event_callback_call(obj, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL); 1858 efl_event_callback_legacy_call(obj, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
1859 return EINA_TRUE; 1859 return EINA_TRUE;
1860} 1860}
1861 1861
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index b4d90cbfba..c4e5ee6796 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -155,13 +155,13 @@ _drag_button_move_cb(void *data,
155 edje_object_part_drag_value_get 155 edje_object_part_drag_value_get
156 (wd->resize_obj, "elm.drag_button_base", &pos, NULL); 156 (wd->resize_obj, "elm.drag_button_base", &pos, NULL);
157 if (pos == 0.0) 157 if (pos == 0.0)
158 efl_event_callback_call 158 efl_event_callback_legacy_call
159 (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !elm_widget_mirrored_get(obj) ? "left" : "right"); 159 (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !elm_widget_mirrored_get(obj) ? "left" : "right");
160 else if (pos == 1.0) 160 else if (pos == 1.0)
161 efl_event_callback_call 161 efl_event_callback_legacy_call
162 (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !elm_widget_mirrored_get(obj) ? "right" : "left"); 162 (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !elm_widget_mirrored_get(obj) ? "right" : "left");
163 else if (pos >= 0.45 && pos <= 0.55) 163 else if (pos >= 0.45 && pos <= 0.55)
164 efl_event_callback_call 164 efl_event_callback_legacy_call
165 (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center"); 165 (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
166} 166}
167 167
@@ -232,15 +232,15 @@ _button_animator(void *data)
232 232
233 if ((!sd->final_position) && 233 if ((!sd->final_position) &&
234 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT)) 234 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
235 efl_event_callback_call 235 efl_event_callback_legacy_call
236 (obj, EFL_UI_EVENT_SELECTED, (char *)left); 236 (obj, EFL_UI_EVENT_SELECTED, (char *)left);
237 else if ((sd->final_position == 0.5) && 237 else if ((sd->final_position == 0.5) &&
238 (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)) 238 (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
239 efl_event_callback_call 239 efl_event_callback_legacy_call
240 (obj, EFL_UI_EVENT_SELECTED, (char *)center); 240 (obj, EFL_UI_EVENT_SELECTED, (char *)center);
241 else if ((sd->final_position == 1) && 241 else if ((sd->final_position == 1) &&
242 (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) 242 (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
243 efl_event_callback_call 243 efl_event_callback_legacy_call
244 (obj, EFL_UI_EVENT_SELECTED, (char *)right); 244 (obj, EFL_UI_EVENT_SELECTED, (char *)right);
245 245
246 sd->button_animator = NULL; 246 sd->button_animator = NULL;
@@ -278,7 +278,7 @@ _drag_button_up_cb(void *data,
278 (elm_widget_mirrored_get(obj) && position == 1.0))) 278 (elm_widget_mirrored_get(obj) && position == 1.0)))
279 { 279 {
280 sd->final_position = 0; 280 sd->final_position = 0;
281 efl_event_callback_call 281 efl_event_callback_legacy_call
282 (obj, EFL_UI_EVENT_SELECTED, (char *)left); 282 (obj, EFL_UI_EVENT_SELECTED, (char *)left);
283 283
284 return; 284 return;
@@ -288,7 +288,7 @@ _drag_button_up_cb(void *data,
288 (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)) 288 (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
289 { 289 {
290 sd->final_position = 0.5; 290 sd->final_position = 0.5;
291 efl_event_callback_call 291 efl_event_callback_legacy_call
292 (obj, EFL_UI_EVENT_SELECTED, (char *)center); 292 (obj, EFL_UI_EVENT_SELECTED, (char *)center);
293 293
294 ecore_animator_del(sd->button_animator); 294 ecore_animator_del(sd->button_animator);
@@ -302,7 +302,7 @@ _drag_button_up_cb(void *data,
302 (elm_widget_mirrored_get(obj) && position == 0.0))) 302 (elm_widget_mirrored_get(obj) && position == 0.0)))
303 { 303 {
304 sd->final_position = 1; 304 sd->final_position = 1;
305 efl_event_callback_call 305 efl_event_callback_legacy_call
306 (obj, EFL_UI_EVENT_SELECTED, (char *)right); 306 (obj, EFL_UI_EVENT_SELECTED, (char *)right);
307 return; 307 return;
308 } 308 }
@@ -372,13 +372,13 @@ _track_move_cb(void *data,
372 { 372 {
373 if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER) 373 if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
374 { 374 {
375 efl_event_callback_call 375 efl_event_callback_legacy_call
376 (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center"); 376 (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
377 sd->final_position = 0.5; 377 sd->final_position = 0.5;
378 } 378 }
379 else if (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT) 379 else if (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)
380 { 380 {
381 efl_event_callback_call 381 efl_event_callback_legacy_call
382 (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right"); 382 (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right");
383 sd->final_position = 1.0; 383 sd->final_position = 1.0;
384 } 384 }
@@ -386,7 +386,7 @@ _track_move_cb(void *data,
386 else if ((sd->final_position == 0.5) && 386 else if ((sd->final_position == 0.5) &&
387 (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) 387 (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
388 { 388 {
389 efl_event_callback_call 389 efl_event_callback_legacy_call
390 (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right"); 390 (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right");
391 sd->final_position = 1.0; 391 sd->final_position = 1.0;