summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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/ector/software/ector_software_buffer.c2
-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/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/modules/emotion/libvlc/emotion_libvlc.c2
-rw-r--r--src/tests/eolian_cxx/generic.c10
-rw-r--r--src/tests/eolian_js/eolian_js_test_test_object_impl.c6
39 files changed, 116 insertions, 116 deletions
diff --git a/src/benchmarks/eo/eo_bench_callbacks.c b/src/benchmarks/eo/eo_bench_callbacks.c
index 9cca977776..7fd145c31a 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_legacy_call(obj[i], SIMPLE_BAR, NULL); 68 efl_event_callback_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 afb794ea0a..4ff26a923b 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -144,14 +144,14 @@ _clicked_button2(void *data, const Efl_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_legacy_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove); 147 efl_event_callback_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove);
148 efl_event_callback_legacy_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown); 148 efl_event_callback_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown);
149 efl_event_callback_legacy_call(td->win, EFL_EVENT_POINTER_UP, td->evup); 149 efl_event_callback_call(td->win, EFL_EVENT_POINTER_UP, td->evup);
150 } 150 }
151 else 151 else
152 { 152 {
153 efl_event_callback_legacy_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown); 153 efl_event_callback_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown);
154 efl_event_callback_legacy_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup); 154 efl_event_callback_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 49a98f675e..5ad60f9010 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_legacy_call(obj, eo_event, e); 1170 efl_event_callback_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 44ee08f39e..e2ef5ac94e 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_legacy_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data); 161 efl_event_callback_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_legacy_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data); 231 efl_event_callback_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 8ce3c6a4fe..08e7d9d95a 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_legacy_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL); 48 efl_event_callback_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 9eb0523857..8295af24f8 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_legacy_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL); 32 efl_event_callback_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 e80f9fb8ef..d8eadaa273 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_legacy_call(loop, EFL_LOOP_EVENT_IDLE, NULL); 119 efl_event_callback_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 5191052126..ad70d87002 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_legacy_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge); 2876 efl_event_callback_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 f7b9cbd61c..46efa8ae85 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_legacy_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL); 661 efl_event_callback_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 ba648e28b0..a0ad5eca2d 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_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); 39 efl_event_callback_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 dbe2ab8469..7130619989 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_legacy_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL); 84 efl_event_callback_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_legacy_call(o, EFL_IO_COPIER_EVENT_DONE, NULL); 92 efl_event_callback_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_legacy_call(o, EFL_IO_COPIER_EVENT_DATA, &slice_of_binbuf); 128 efl_event_callback_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_legacy_call(o, EFL_IO_COPIER_EVENT_LINE, &slice_of_binbuf); 144 efl_event_callback_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_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); 194 efl_event_callback_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_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); 202 efl_event_callback_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_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); 265 efl_event_callback_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_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); 280 efl_event_callback_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_legacy_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL); 323 efl_event_callback_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 Efl_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_legacy_call(o, EFL_IO_COPIER_EVENT_DONE, NULL); 427 efl_event_callback_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_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err); 433 efl_event_callback_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_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); 604 efl_event_callback_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 cc5edc9e25..40c0346f01 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_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); 49 efl_event_callback_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 574e7faefa..a1df02f107 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_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); 47 efl_event_callback_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 8a5ca4ffb3..b5a94275c4 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_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); 81 efl_event_callback_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_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL); 97 efl_event_callback_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 9e9326a612..a57d1a9496 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_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); 34 efl_event_callback_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 9e1b291b92..dac739b116 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_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); 85 efl_event_callback_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 b04e77df68..d1406e7922 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_legacy_call(obj, EFL_LOOP_FD_EVENT_READ, NULL); 34 efl_event_callback_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_legacy_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL); 38 efl_event_callback_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_legacy_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL); 42 efl_event_callback_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 c4af7c42cb..ff8bd5b900 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_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); 30 efl_event_callback_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_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL); 44 efl_event_callback_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_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL); 110 efl_event_callback_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_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL); 114 efl_event_callback_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 edbbb197f0..676d72dc60 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_legacy_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL); 223 efl_event_callback_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_legacy_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); 228 efl_event_callback_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_legacy_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL); 254 efl_event_callback_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 f6369e532c..8340c3d463 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_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL); 1056 efl_event_callback_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_legacy_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info); 1135 efl_event_callback_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_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL); 1160 efl_event_callback_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_legacy_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info); 1242 efl_event_callback_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_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error); 1268 efl_event_callback_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_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error); 1289 efl_event_callback_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 7fbd0c7d75..5da1847404 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_legacy_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e); 1143 efl_event_callback_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_legacy_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e); 1204 efl_event_callback_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_legacy_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e); 1263 efl_event_callback_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 8b34b75047..636a0f309c 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -254,7 +254,7 @@ _efl_net_dialer_http_curlm_check(Efl_Net_Dialer_Http_Curlm *cm)
254 DBG("HTTP dialer=%p error: #%d '%s'", 254 DBG("HTTP dialer=%p error: #%d '%s'",
255 dialer, err, eina_error_msg_get(err)); 255 dialer, err, eina_error_msg_get(err));
256 pd->error = err; 256 pd->error = err;
257 efl_event_callback_legacy_call(dialer, EFL_NET_DIALER_EVENT_ERROR, &err); 257 efl_event_callback_call(dialer, EFL_NET_DIALER_EVENT_ERROR, &err);
258 } 258 }
259 259
260 if (msg->msg != CURLMSG_DONE) continue; 260 if (msg->msg != CURLMSG_DONE) continue;
@@ -765,7 +765,7 @@ _efl_net_dialer_http_headers_done(Eo *o, Efl_Net_Dialer_Http_Data *pd)
765 efl_net_dialer_http_response_content_type_set(o, s); 765 efl_net_dialer_http_response_content_type_set(o, s);
766 766
767 pd->pending_headers_done = EINA_FALSE; 767 pd->pending_headers_done = EINA_FALSE;
768 efl_event_callback_legacy_call(o, EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, NULL); 768 efl_event_callback_call(o, EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, NULL);
769} 769}
770 770
771/* take data from internal buffer filled with efl_io_writer_write() 771/* take data from internal buffer filled with efl_io_writer_write()
@@ -1121,7 +1121,7 @@ _efl_net_dialer_http_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Http_Dat
1121 * allow_redirects will trigger more than once 1121 * allow_redirects will trigger more than once
1122 */ 1122 */
1123 pd->connected = connected; 1123 pd->connected = connected;
1124 if (connected) efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); 1124 if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL);
1125} 1125}
1126 1126
1127EOLIAN static Eina_Bool 1127EOLIAN static Eina_Bool
@@ -1185,7 +1185,7 @@ EOLIAN static void
1185_efl_net_dialer_http_efl_net_socket_address_remote_set(Eo *o, Efl_Net_Dialer_Http_Data *pd, const char *address) 1185_efl_net_dialer_http_efl_net_socket_address_remote_set(Eo *o, Efl_Net_Dialer_Http_Data *pd, const char *address)
1186{ 1186{
1187 if (eina_stringshare_replace(&pd->address_remote, address)) 1187 if (eina_stringshare_replace(&pd->address_remote, address))
1188 efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 1188 efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL);
1189} 1189}
1190 1190
1191EOLIAN static const char * 1191EOLIAN static const char *
@@ -1248,7 +1248,7 @@ _efl_net_dialer_http_efl_io_reader_can_read_set(Eo *o, Efl_Net_Dialer_Http_Data
1248 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); 1248 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
1249 if (pd->can_read == can_read) return; 1249 if (pd->can_read == can_read) return;
1250 pd->can_read = can_read; 1250 pd->can_read = can_read;
1251 efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); 1251 efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
1252} 1252}
1253 1253
1254EOLIAN static Eina_Bool 1254EOLIAN static Eina_Bool
@@ -1265,7 +1265,7 @@ _efl_net_dialer_http_efl_io_reader_eos_set(Eo *o, Efl_Net_Dialer_Http_Data *pd,
1265 pd->eos = is_eos; 1265 pd->eos = is_eos;
1266 if (is_eos) pd->connected = EINA_FALSE; 1266 if (is_eos) pd->connected = EINA_FALSE;
1267 if (is_eos) 1267 if (is_eos)
1268 efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL); 1268 efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL);
1269} 1269}
1270 1270
1271EOLIAN static Eina_Error 1271EOLIAN static Eina_Error
@@ -1338,7 +1338,7 @@ _efl_net_dialer_http_efl_io_writer_can_write_set(Eo *o, Efl_Net_Dialer_Http_Data
1338 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o)); 1338 EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
1339 if (pd->can_write == can_write) return; 1339 if (pd->can_write == can_write) return;
1340 pd->can_write = can_write; 1340 pd->can_write = can_write;
1341 efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); 1341 efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
1342} 1342}
1343 1343
1344EOLIAN static Eina_Error 1344EOLIAN static Eina_Error
@@ -1369,7 +1369,7 @@ _efl_net_dialer_http_efl_io_closer_close(Eo *o, Efl_Net_Dialer_Http_Data *pd)
1369 efl_io_reader_eos_set(o, EINA_FALSE); 1369 efl_io_reader_eos_set(o, EINA_FALSE);
1370 efl_net_dialer_connected_set(o, EINA_FALSE); 1370 efl_net_dialer_connected_set(o, EINA_FALSE);
1371 pd->closed = EINA_TRUE; 1371 pd->closed = EINA_TRUE;
1372 efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); 1372 efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
1373 return err; 1373 return err;
1374} 1374}
1375 1375
@@ -1722,7 +1722,7 @@ _efl_net_dialer_http_request_content_length_set(Eo *o, Efl_Net_Dialer_Http_Data
1722 1722
1723 pm = _efl_net_dialer_http_primary_mode_effective_get(pd); 1723 pm = _efl_net_dialer_http_primary_mode_effective_get(pd);
1724 if (pm == EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD) 1724 if (pm == EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD)
1725 efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); 1725 efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
1726} 1726}
1727 1727
1728EOLIAN static int64_t 1728EOLIAN static int64_t
@@ -1742,7 +1742,7 @@ _efl_net_dialer_http_response_content_length_set(Eo *o, Efl_Net_Dialer_Http_Data
1742 1742
1743 pm = _efl_net_dialer_http_primary_mode_effective_get(pd); 1743 pm = _efl_net_dialer_http_primary_mode_effective_get(pd);
1744 if (pm == EFL_NET_DIALER_HTTP_PRIMARY_MODE_DOWNLOAD) 1744 if (pm == EFL_NET_DIALER_HTTP_PRIMARY_MODE_DOWNLOAD)
1745 efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); 1745 efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
1746} 1746}
1747 1747
1748EOLIAN static int64_t 1748EOLIAN 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 bea0652801..88f78fe971 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_legacy_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL); 118 efl_event_callback_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_legacy_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL); 190 if (connected) efl_event_callback_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 505c82c277..33448c6ade 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 Efl_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_legacy_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 93 efl_event_callback_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 Efl_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_legacy_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 110 efl_event_callback_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_legacy_call(o, EFL_NET_SERVER_EVENT_SERVING, NULL); 208 efl_event_callback_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 6eb04a77f1..104b9133f9 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_legacy_call(o, EFL_NET_SERVER_EVENT_ERROR, &err); 138 efl_event_callback_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_legacy_call(o, EFL_NET_SERVER_EVENT_CLIENT_ADD, client); 174 efl_event_callback_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_legacy_call(o, EFL_NET_SERVER_EVENT_CLIENT_REJECTED, str); 198 efl_event_callback_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/ector/software/ector_software_buffer.c b/src/lib/ector/software/ector_software_buffer.c
index 66c7508b96..499206309d 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_legacy_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8); 72 efl_event_callback_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/efl/interfaces/efl_io_buffer.c b/src/lib/efl/interfaces/efl_io_buffer.c
index 04e5fdfd6e..45f3ef59ad 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_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); 42 efl_event_callback_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_legacy_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL); 58 efl_event_callback_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_legacy_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL); 130 efl_event_callback_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_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); 216 efl_event_callback_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_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL); 231 efl_event_callback_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_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); 276 efl_event_callback_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_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); 301 efl_event_callback_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_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); 310 efl_event_callback_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_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL); 362 efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
363 if (reallocated) 363 if (reallocated)
364 efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL); 364 efl_event_callback_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_legacy_call(o, EFL_IO_BUFFER_EVENT_POSITION_READ_CHANGED, NULL); 440 efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_POSITION_READ_CHANGED, NULL);
441 if (changed) 441 if (changed)
442 efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); 442 efl_event_callback_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_legacy_call(o, EFL_IO_BUFFER_EVENT_POSITION_WRITE_CHANGED, NULL); 472 efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_POSITION_WRITE_CHANGED, NULL);
473 if (changed) 473 if (changed)
474 efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL); 474 efl_event_callback_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 2420b863f9..a4dcf3216b 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_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); 183 efl_event_callback_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_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); 219 efl_event_callback_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_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); 288 efl_event_callback_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_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL); 312 efl_event_callback_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_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL); 330 efl_event_callback_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_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL); 387 efl_event_callback_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_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL); 410 efl_event_callback_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_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); 420 efl_event_callback_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 ec433e64e6..3b32205a79 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_legacy_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 97 efl_event_callback_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_legacy_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 113 efl_event_callback_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 96887e3f8d..37613fca11 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_legacy_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL); 44 efl_event_callback_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_legacy_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL); 55 efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL);
56 else 56 else
57 efl_event_callback_legacy_call(obj, EFL_VPATH_FILE_EVENT_FAILED, NULL); 57 efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FAILED, NULL);
58 } 58 }
59} 59}
60 60
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index be6f0942c6..a7ab9495a6 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_legacy_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 98 efl_event_callback_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_legacy_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt); 183 efl_event_callback_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_legacy_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt); 216 efl_event_callback_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 153828ee8f..c21b0c2052 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_legacy_call(pd->object, translated_event, event_info); 76 efl_event_callback_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 b78409194e..f9f7f51c47 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_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 293 efl_event_callback_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 558cb85acd..465673ad33 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_legacy_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count); 344 efl_event_callback_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 5adc31b5e6..e36f941a0d 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_legacy_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL); 98 efl_event_callback_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 0b5ba49fd5..54eb6c667a 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_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 623 efl_event_callback_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_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 689 efl_event_callback_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/modules/emotion/libvlc/emotion_libvlc.c b/src/modules/emotion/libvlc/emotion_libvlc.c
index d4fcab32e9..f994e4d8d9 100644
--- a/src/modules/emotion/libvlc/emotion_libvlc.c
+++ b/src/modules/emotion/libvlc/emotion_libvlc.c
@@ -280,7 +280,7 @@ evas_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
280 280
281 evas_object_image_size_get(ev->evas_obj, &w, &h); 281 evas_object_image_size_get(ev->evas_obj, &w, &h);
282 _emotion_frame_resize(ev->obj, w, h, w / (double) h); 282 _emotion_frame_resize(ev->obj, w, h, w / (double) h);
283 efl_event_callback_legacy_call(ev->obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL); 283 efl_event_callback_call(ev->obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL);
284} 284}
285 285
286/* Fetch all libvlc tracks. */ 286/* Fetch all libvlc tracks. */
diff --git a/src/tests/eolian_cxx/generic.c b/src/tests/eolian_cxx/generic.c
index 8dcf5b6bf4..d7483b33bd 100644
--- a/src/tests/eolian_cxx/generic.c
+++ b/src/tests/eolian_cxx/generic.c
@@ -100,23 +100,23 @@ static void _generic_out_optional_ctor_b(Eo *obj EINA_UNUSED, Generic_Data* pd,
100 100
101static void _generic_call_event1(Eo *obj, Generic_Data* pd EINA_UNUSED) 101static void _generic_call_event1(Eo *obj, Generic_Data* pd EINA_UNUSED)
102{ 102{
103 efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT1, NULL); 103 efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT1, NULL);
104} 104}
105static void _generic_call_event2(Eo *obj, Generic_Data* pd EINA_UNUSED) 105static void _generic_call_event2(Eo *obj, Generic_Data* pd EINA_UNUSED)
106{ 106{
107 efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT2, obj); 107 efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT2, obj);
108} 108}
109static void _generic_call_event3(Eo *obj, Generic_Data* pd EINA_UNUSED) 109static void _generic_call_event3(Eo *obj, Generic_Data* pd EINA_UNUSED)
110{ 110{
111 int p = 42; 111 int p = 42;
112 efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT3, &p); 112 efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT3, &p);
113} 113}
114static void _generic_call_event4(Eo *obj, Generic_Data* pd EINA_UNUSED) 114static void _generic_call_event4(Eo *obj, Generic_Data* pd EINA_UNUSED)
115{ 115{
116 int i = 42; 116 int i = 42;
117 Eina_List* p = eina_list_append(NULL, &i); 117 Eina_List* p = eina_list_append(NULL, &i);
118 ck_assert(p != NULL); 118 ck_assert(p != NULL);
119 efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT4, p); 119 efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT4, p);
120 eina_list_free(p); 120 eina_list_free(p);
121} 121}
122static void _generic_call_event5(Eo *obj, Generic_Data* pd EINA_UNUSED) 122static void _generic_call_event5(Eo *obj, Generic_Data* pd EINA_UNUSED)
@@ -125,7 +125,7 @@ static void _generic_call_event5(Eo *obj, Generic_Data* pd EINA_UNUSED)
125 Eina_List* p = eina_list_append(NULL, &i); 125 Eina_List* p = eina_list_append(NULL, &i);
126 126
127 Generic_Event e = {.field1 = 42, .field2 = p}; 127 Generic_Event e = {.field1 = 42, .field2 = p};
128 efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT5, &e); 128 efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT5, &e);
129 eina_list_free(p); 129 eina_list_free(p);
130} 130}
131static void _generic_protected_method1(Eo *obj EINA_UNUSED, Generic_Data* pd EINA_UNUSED) 131static void _generic_protected_method1(Eo *obj EINA_UNUSED, Generic_Data* pd EINA_UNUSED)
diff --git a/src/tests/eolian_js/eolian_js_test_test_object_impl.c b/src/tests/eolian_js/eolian_js_test_test_object_impl.c
index 63a4a7a7c4..af4acbfee4 100644
--- a/src/tests/eolian_js/eolian_js_test_test_object_impl.c
+++ b/src/tests/eolian_js/eolian_js_test_test_object_impl.c
@@ -191,9 +191,9 @@ _test_object_event_emit(Eo* obj, Test_Object_Data *pd EINA_UNUSED)
191 fprintf(stdout, "_test_object_event_emit()\n"); 191 fprintf(stdout, "_test_object_event_emit()\n");
192 fflush(stdout); 192 fflush(stdout);
193 static Test_Struct_Ex s = {42, TEST_ENUM_EX_THIRD}; 193 static Test_Struct_Ex s = {42, TEST_ENUM_EX_THIRD};
194 efl_event_callback_legacy_call(obj, TEST_OBJECT_EVENT_TEST, NULL); 194 efl_event_callback_call(obj, TEST_OBJECT_EVENT_TEST, NULL);
195 efl_event_callback_legacy_call(obj, TEST_OBJECT_EVENT_TEST_STRUCTARG, &s); 195 efl_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRUCTARG, &s);
196 efl_event_callback_legacy_call(obj, TEST_OBJECT_EVENT_TEST_STRINGARG, "foo"); 196 efl_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRINGARG, "foo");
197} 197}
198 198
199EOLIAN static char * 199EOLIAN static char *