aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ecore
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ecore')
-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
15 files changed, 30 insertions, 30 deletions
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,
ecore_event_add(event_type, e,
_ecore_exe_event_exe_data_free,
NULL);
- efl_event_callback_legacy_call(obj, eo_event, e);
+ efl_event_callback_call(obj, eo_event, e);
}
}
}
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)
ecore_event_add(ECORE_EXE_EVENT_DATA, event_data,
_ecore_exe_event_exe_data_free,
NULL);
- efl_event_callback_legacy_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data);
+ efl_event_callback_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data);
}
current_buf = NULL;
@@ -228,7 +228,7 @@ _ecore_exe_pipe_error_thread_cb(void *data)
ecore_event_add(ECORE_EXE_EVENT_ERROR, event_data,
_ecore_exe_event_exe_data_free,
NULL);
- efl_event_callback_legacy_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data);
+ efl_event_callback_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data);
}
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)
void
_ecore_idle_enterer_call(Eo *loop)
{
- efl_event_callback_legacy_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL);
+ efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL);
}
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)
void
_ecore_idle_exiter_call(Eo *loop)
{
- efl_event_callback_legacy_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
+ efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
}
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)
void
_ecore_idler_all_call(Eo *loop)
{
- efl_event_callback_legacy_call(loop, EFL_LOOP_EVENT_IDLE, NULL);
+ efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE, NULL);
}
int
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)
arge.initialization = initialization;
initialization = EINA_FALSE;
- efl_event_callback_legacy_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge);
+ efl_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge);
_efl_loop_arguments_cleanup(arga);
}
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)
efl_ref(timer->object);
eina_evlog("+timer", timer, 0.0, NULL);
- efl_event_callback_legacy_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL);
+ efl_event_callback_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL);
eina_evlog("-timer", timer, 0.0, NULL);
/* 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
efl_io_closer_fd_closer_fd_set(o, -1);
if (close(fd) < 0) err = errno;
- efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
+ efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
return err;
}
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)
if (pd->destination && efl_io_writer_can_write_get(pd->destination))
_efl_io_copier_write(o, pd);
- efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL);
+ efl_event_callback_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL);
if (!pd->source || efl_io_reader_eos_get(pd->source))
{
@@ -89,7 +89,7 @@ _efl_io_copier_job(void *data, void *value EINA_UNUSED)
((!pd->destination) || (eina_binbuf_length_get(pd->buf) == 0)))
{
pd->done = EINA_TRUE;
- efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_DONE, NULL);
+ efl_event_callback_call(o, EFL_IO_COPIER_EVENT_DONE, NULL);
}
}
}
@@ -125,7 +125,7 @@ _efl_io_copier_dispatch_data_events(Eo *o, Efl_Io_Copier_Data *pd, Eina_Slice sl
offset = slice_of_binbuf.bytes - tmp.bytes;
- efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_DATA, &slice_of_binbuf);
+ efl_event_callback_call(o, EFL_IO_COPIER_EVENT_DATA, &slice_of_binbuf);
/* user may have modified pd->buf, like calling
* efl_io_copier_buffer_limit_set()
*/
@@ -141,7 +141,7 @@ _efl_io_copier_dispatch_data_events(Eo *o, Efl_Io_Copier_Data *pd, Eina_Slice sl
if (pd->line_delimiter.len > 0)
{
- efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_LINE, &slice_of_binbuf);
+ efl_event_callback_call(o, EFL_IO_COPIER_EVENT_LINE, &slice_of_binbuf);
/* user may have modified pd->buf, like calling
* efl_io_copier_buffer_limit_set()
*/
@@ -191,7 +191,7 @@ _efl_io_copier_read(Eo *o, Efl_Io_Copier_Data *pd)
err = efl_io_reader_read(pd->source, &rw_slice);
if (err)
{
- efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
+ efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
return;
}
@@ -199,7 +199,7 @@ _efl_io_copier_read(Eo *o, Efl_Io_Copier_Data *pd)
if (!eina_binbuf_append_slice(pd->buf, ro_slice))
{
err = ENOMEM;
- efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
+ efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
return;
}
@@ -262,7 +262,7 @@ _efl_io_copier_write(Eo *o, Efl_Io_Copier_Data *pd)
if (err)
{
if (err != EAGAIN)
- efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
+ efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
return;
}
pd->progress.written += ro_slice.len;
@@ -277,7 +277,7 @@ _efl_io_copier_write(Eo *o, Efl_Io_Copier_Data *pd)
if (!eina_binbuf_remove(pd->buf, 0, ro_slice.len))
{
err = ENOMEM;
- efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
+ efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
return;
}
@@ -320,7 +320,7 @@ _efl_io_copier_source_size_apply(Eo *o, Efl_Io_Copier_Data *pd)
if (pd->destination && efl_isa(pd->destination, EFL_IO_SIZER_MIXIN))
efl_io_sizer_resize(pd->destination, pd->progress.total);
- efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL);
+ efl_event_callback_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL);
}
static void
@@ -424,13 +424,13 @@ _efl_io_copier_destination_closed(void *data, const Efl_Event *event EINA_UNUSED
if (!pd->done)
{
pd->done = EINA_TRUE;
- efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_DONE, NULL);
+ efl_event_callback_call(o, EFL_IO_COPIER_EVENT_DONE, NULL);
}
}
else
{
Eina_Error err = EBADF;
- efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
+ efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
}
}
@@ -601,7 +601,7 @@ _efl_io_copier_efl_io_closer_close(Eo *o, Efl_Io_Copier_Data *pd)
}
pd->closed = EINA_TRUE;
- efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
+ efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
if (pd->buf)
{
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)
if (pd->last_position != pos)
{
pd->last_position = pos;
- efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
+ efl_event_callback_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
}
}
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
int fd = efl_io_positioner_fd_positioner_fd_get(o);
if (lseek(fd, (off_t)offset, _efl_io_positioner_whence_convert(whence)) < 0)
return errno;
- efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
+ efl_event_callback_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
return 0;
}
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
EINA_SAFETY_ON_TRUE_RETURN(efl_io_reader_fd_reader_fd_get(o) < 0);
if (pd->can_read == can_read) return;
pd->can_read = can_read;
- efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
+ efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
}
EOLIAN 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
if (pd->eos == is_eos) return;
pd->eos = is_eos;
if (is_eos)
- efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL);
+ efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL);
}
#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
{
int fd = efl_io_sizer_fd_sizer_fd_get(o);
if (ftruncate(fd, size) < 0) return errno;
- efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
+ efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
return 0;
}
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,
EINA_SAFETY_ON_TRUE_RETURN(efl_io_writer_fd_writer_fd_get(o) < 0);
if (pd->can_write == can_write) return;
pd->can_write = can_write;
- efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
+ efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
}
#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)
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
{
- efl_event_callback_legacy_call(obj, EFL_LOOP_FD_EVENT_READ, NULL);
+ efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_READ, NULL);
}
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
{
- efl_event_callback_legacy_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL);
+ efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL);
}
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR))
{
- efl_event_callback_legacy_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL);
+ efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL);
}
return ECORE_CALLBACK_RENEW;