Efl Object: remove legacy callback calls from event_callback_call
authorVitor Sousa <vitorsousasilva@gmail.com>
Mon, 22 Aug 2016 22:40:39 +0000 (19:40 -0300)
committerVitor Sousa <vitorsousasilva@gmail.com>
Fri, 26 Aug 2016 18:45:07 +0000 (15:45 -0300)
Efl.Object.event_callback_call no longer calls legacy smart callbacks;
calling only event callbacks registered with the given event description
pointer.

Create the method Efl.Object.event_callback_legacy_call to inherit the old
behavior from Efl.Object.event_callback_call, calling both Efl.Object events
and legacy smart callbacks.

Update all other files accordingly in order to still supply legacy
callbacks while they are necessary.

131 files changed:
src/benchmarks/eo/eo_bench_callbacks.c
src/bin/elementary/test_events.c
src/lib/ecore/ecore_exe_posix.c
src/lib/ecore/ecore_exe_win32.c
src/lib/ecore/ecore_idle_enterer.c
src/lib/ecore/ecore_idle_exiter.c
src/lib/ecore/ecore_idler.c
src/lib/ecore/ecore_main.c
src/lib/ecore/ecore_timer.c
src/lib/ecore/efl_io_closer_fd.c
src/lib/ecore/efl_io_copier.c
src/lib/ecore/efl_io_file.c
src/lib/ecore/efl_io_positioner_fd.c
src/lib/ecore/efl_io_reader_fd.c
src/lib/ecore/efl_io_sizer_fd.c
src/lib/ecore/efl_io_writer_fd.c
src/lib/ecore/efl_loop_fd.c
src/lib/ecore_audio/ecore_audio_obj_in.c
src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
src/lib/ecore_con/ecore_con.c
src/lib/ecore_con/ecore_con_url.c
src/lib/ecore_con/efl_net_dialer_http.c
src/lib/ecore_con/efl_net_dialer_tcp.c
src/lib/ecore_con/efl_net_server_fd.c
src/lib/ecore_con/efl_net_server_tcp.c
src/lib/ecore_evas/ecore_evas.c
src/lib/ector/software/ector_software_buffer.c
src/lib/edje/edje_calc.c
src/lib/efl/interfaces/efl_gfx_shape.c
src/lib/efl/interfaces/efl_io_buffer.c
src/lib/efl/interfaces/efl_io_queue.c
src/lib/efl/interfaces/efl_model_common.c
src/lib/efl/interfaces/efl_vpath_file.c
src/lib/eio/efl_io_manager.c
src/lib/eio/eio_model.c
src/lib/eio/eio_sentry.c
src/lib/eldbus/eldbus_model_arguments.c
src/lib/eldbus/eldbus_model_connection.c
src/lib/eldbus/eldbus_model_method.c
src/lib/eldbus/eldbus_model_proxy.c
src/lib/elementary/efl_ui_box.c
src/lib/elementary/efl_ui_flip.c
src/lib/elementary/efl_ui_frame.c
src/lib/elementary/efl_ui_grid.c
src/lib/elementary/efl_ui_image.c
src/lib/elementary/efl_ui_internal_text_interactive.c
src/lib/elementary/efl_ui_nstate.c
src/lib/elementary/efl_ui_text.c
src/lib/elementary/efl_ui_win.c
src/lib/elementary/elc_combobox.c
src/lib/elementary/elc_ctxpopup.c
src/lib/elementary/elc_fileselector.c
src/lib/elementary/elc_fileselector_button.c
src/lib/elementary/elc_fileselector_entry.c
src/lib/elementary/elc_hoversel.c
src/lib/elementary/elc_multibuttonentry.c
src/lib/elementary/elc_naviframe.c
src/lib/elementary/elc_player.c
src/lib/elementary/elc_popup.c
src/lib/elementary/elm_actionslider.c
src/lib/elementary/elm_app_client.c
src/lib/elementary/elm_app_client_view.c
src/lib/elementary/elm_app_server.c
src/lib/elementary/elm_app_server_view.c
src/lib/elementary/elm_atspi_bridge.c
src/lib/elementary/elm_box.c
src/lib/elementary/elm_bubble.c
src/lib/elementary/elm_button.c
src/lib/elementary/elm_calendar.c
src/lib/elementary/elm_check.c
src/lib/elementary/elm_clock.c
src/lib/elementary/elm_code.c
src/lib/elementary/elm_code_widget.c
src/lib/elementary/elm_code_widget_selection.c
src/lib/elementary/elm_colorselector.c
src/lib/elementary/elm_conform.c
src/lib/elementary/elm_datetime.c
src/lib/elementary/elm_dayselector.c
src/lib/elementary/elm_diskselector.c
src/lib/elementary/elm_entry.c
src/lib/elementary/elm_flipselector.c
src/lib/elementary/elm_gengrid.c
src/lib/elementary/elm_genlist.c
src/lib/elementary/elm_glview.c
src/lib/elementary/elm_hover.c
src/lib/elementary/elm_icon.c
src/lib/elementary/elm_index.c
src/lib/elementary/elm_interface_scrollable.c
src/lib/elementary/elm_label.c
src/lib/elementary/elm_layout.c
src/lib/elementary/elm_list.c
src/lib/elementary/elm_map.c
src/lib/elementary/elm_menu.c
src/lib/elementary/elm_notify.c
src/lib/elementary/elm_panel.c
src/lib/elementary/elm_panes.c
src/lib/elementary/elm_photo.c
src/lib/elementary/elm_photocam.c
src/lib/elementary/elm_plug.c
src/lib/elementary/elm_prefs.c
src/lib/elementary/elm_progressbar.c
src/lib/elementary/elm_radio.c
src/lib/elementary/elm_scroller.c
src/lib/elementary/elm_segment_control.c
src/lib/elementary/elm_slider.c
src/lib/elementary/elm_slideshow.c
src/lib/elementary/elm_spinner.c
src/lib/elementary/elm_thumb.c
src/lib/elementary/elm_toolbar.c
src/lib/elementary/elm_view_list.c
src/lib/elementary/elm_widget.c
src/lib/emotion/emotion_smart.c
src/lib/eo/efl_object.eo
src/lib/eo/eo_base_class.c
src/lib/evas/canvas/evas_callbacks.c
src/lib/evas/canvas/evas_canvas3d_node.c
src/lib/evas/canvas/evas_canvas3d_scene.c
src/lib/evas/canvas/evas_object_box.c
src/lib/evas/canvas/evas_object_smart.c
src/lib/evas/canvas/evas_object_textblock.c
src/lib/evas/canvas/evas_vg_node.c
src/lib/evas/canvas/evas_vg_private.h
src/modules/emotion/libvlc/emotion_libvlc.c
src/tests/eo/access/access_simple.c
src/tests/eo/composite_objects/composite_objects_simple.c
src/tests/eo/signals/signals_main.c
src/tests/eo/signals/signals_simple.c
src/tests/eo/suite/eo_test_class_simple.c
src/tests/eo/suite/eo_test_general.c
src/tests/eolian_cxx/generic.c
src/tests/eolian_js/eolian_js_test_test_object_impl.c

index 4c8a9f3..1846a70 100644 (file)
@@ -65,7 +65,7 @@ bench_eo_callbacks_call(int request)
         for (j = 0 ; j < (int) (distribution[i] * request) ; j++)
           {
              /* Miss finding the callbacks on purpose, so we measure worst case scenario. */
-             efl_event_callback_call(obj[i], SIMPLE_BAR, NULL);
+             efl_event_callback_legacy_call(obj[i], SIMPLE_BAR, NULL);
           }
      }
 
index 60bd7f8..45ba432 100644 (file)
@@ -144,14 +144,14 @@ _clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED)
         efl_input_pointer_position_set(td->evdown, x, y);
         efl_input_pointer_position_set(td->evup, x, y);
 
-        efl_event_callback_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove);
-        efl_event_callback_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown);
-        efl_event_callback_call(td->win, EFL_EVENT_POINTER_UP, td->evup);
+        efl_event_callback_legacy_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove);
+        efl_event_callback_legacy_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown);
+        efl_event_callback_legacy_call(td->win, EFL_EVENT_POINTER_UP, td->evup);
      }
    else
      {
-        efl_event_callback_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown);
-        efl_event_callback_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup);
+        efl_event_callback_legacy_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown);
+        efl_event_callback_legacy_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup);
         efl_del(td->evkeydown);
         efl_del(td->evkeyup);
         td->evkeydown = NULL;
index 5ad60f9..49a98f6 100644 (file)
@@ -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_call(obj, eo_event, e);
+                       efl_event_callback_legacy_call(obj, eo_event, e);
                     }
                }
             }
index e2ef5ac..44ee08f 100644 (file)
@@ -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_call(obj, ECORE_EXE_EVENT_DATA_GET, event_data);
+             efl_event_callback_legacy_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_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data);
+             efl_event_callback_legacy_call(obj, ECORE_EXE_EVENT_DATA_ERROR, event_data);
           }
 
         current_buf = NULL;
index 08e7d9d..8ce3c6a 100644 (file)
@@ -45,5 +45,5 @@ ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
 void
 _ecore_idle_enterer_call(Eo *loop)
 {
-   efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL);
+   efl_event_callback_legacy_call(loop, EFL_LOOP_EVENT_IDLE_ENTER, NULL);
 }
index 8295af2..9eb0523 100644 (file)
@@ -29,5 +29,5 @@ ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
 void
 _ecore_idle_exiter_call(Eo *loop)
 {
-   efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
+   efl_event_callback_legacy_call(loop, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
 }
index e116852..69c6207 100644 (file)
@@ -116,7 +116,7 @@ ecore_idler_del(Ecore_Idler *idler)
 void
 _ecore_idler_all_call(Eo *loop)
 {
-   efl_event_callback_call(loop, EFL_LOOP_EVENT_IDLE, NULL);
+   efl_event_callback_legacy_call(loop, EFL_LOOP_EVENT_IDLE, NULL);
 }
 
 int
index 5e941ed..7d0c5d1 100644 (file)
@@ -2873,7 +2873,7 @@ _efl_loop_arguments_send(void *data, void *value EINA_UNUSED)
    arge.initialization = initialization;
    initialization = EINA_FALSE;
 
-   efl_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge);
+   efl_event_callback_legacy_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge);
 
    _efl_loop_arguments_cleanup(arga);
 }
index 9998ff3..67cd247 100644 (file)
@@ -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_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL);
+        efl_event_callback_legacy_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL);
         eina_evlog("-timer", timer, 0.0, NULL);
 
         /* may have changed in recursive main loops */
index a0ad5ec..ba648e2 100644 (file)
@@ -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_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
    return err;
 }
 
index 029c494..b75182b 100644 (file)
@@ -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_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL);
+   efl_event_callback_legacy_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_call(o, EFL_IO_COPIER_EVENT_DONE, NULL);
+             efl_event_callback_legacy_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_call(o, EFL_IO_COPIER_EVENT_DATA, &slice_of_binbuf);
+   efl_event_callback_legacy_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_call(o, EFL_IO_COPIER_EVENT_LINE, &slice_of_binbuf);
+        efl_event_callback_legacy_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_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
+        efl_event_callback_legacy_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_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
+        efl_event_callback_legacy_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_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
+          efl_event_callback_legacy_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_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
+        efl_event_callback_legacy_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_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_PROGRESS, NULL);
 }
 
 static void
@@ -424,13 +424,13 @@ _efl_io_copier_destination_closed(void *data, const Eo_Event *event EINA_UNUSED)
         if (!pd->done)
           {
              pd->done = EINA_TRUE;
-             efl_event_callback_call(o, EFL_IO_COPIER_EVENT_DONE, NULL);
+             efl_event_callback_legacy_call(o, EFL_IO_COPIER_EVENT_DONE, NULL);
           }
      }
    else
      {
         Eina_Error err = EBADF;
-        efl_event_callback_call(o, EFL_IO_COPIER_EVENT_ERROR, &err);
+        efl_event_callback_legacy_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_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
 
    if (pd->buf)
      {
index 40c0346..cc5edc9 100644 (file)
@@ -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_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
+        efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
      }
 }
 
index a1df02f..574e7fa 100644 (file)
@@ -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_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
    return 0;
 }
 
index b5a9427..8a5ca4f 100644 (file)
@@ -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_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
+   efl_event_callback_legacy_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_call(o, EFL_IO_READER_EVENT_EOS, NULL);
+     efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL);
 }
 
 #include "efl_io_reader_fd.eo.c"
index a57d1a9..9e9326a 100644 (file)
@@ -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_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
    return 0;
 }
 
index dac739b..9e1b291 100644 (file)
@@ -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_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
 }
 
 #include "efl_io_writer_fd.eo.c"
index 672dc18..9c9f7a5 100644 (file)
@@ -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_call(obj, EFL_LOOP_FD_EVENT_READ, NULL);
+        efl_event_callback_legacy_call(obj, EFL_LOOP_FD_EVENT_READ, NULL);
      }
    if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
      {
-        efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL);
+        efl_event_callback_legacy_call(obj, EFL_LOOP_FD_EVENT_WRITE, NULL);
      }
    if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR))
      {
-        efl_event_callback_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL);
+        efl_event_callback_legacy_call(obj, EFL_LOOP_FD_EVENT_ERROR, NULL);
      }
 
    return ECORE_CALLBACK_RENEW;
index ff8bd5b..c4af7c4 100644 (file)
@@ -27,7 +27,7 @@ _ecore_audio_in_speed_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, double
 
   obj->speed = speed;
 
-  efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
+  efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
 }
 
 EOLIAN static double
@@ -41,7 +41,7 @@ _ecore_audio_in_samplerate_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, i
 {
   obj->samplerate = samplerate;
 
-  efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
+  efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL);
 }
 
 EOLIAN static int
@@ -107,11 +107,11 @@ _ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len)
       len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len);
       if (len_read == 0) {
           if (!obj->looped || !obj->seekable) {
-              efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL);
+              efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL);
           } else {
               ecore_audio_obj_in_seek(eo_obj, 0, SEEK_SET);
               len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len);
-              efl_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL);
+              efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL);
           }
       }
 
index 5adef64..58130b2 100644 (file)
@@ -220,12 +220,12 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
    if (state == PA_CONTEXT_READY) {
       DBG("PA context ready.");
       EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
-         efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL);
+         efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL);
       }
    } else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) {
       DBG("PA context fail.");
       EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
-         efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
+         efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
       }
    } else {
       DBG("Connection state %i", state);
@@ -251,7 +251,7 @@ static void _state_job(void *data EINA_UNUSED)
         }
         // the callback here can delete things in the list..
         EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
-           efl_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
+           efl_event_callback_legacy_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL);
         }
         // now unref everything safely
         EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
index 8340c3d..f6369e5 100644 (file)
@@ -1053,7 +1053,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
    if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE;
    ecore_event_add(ev, e,
                    _ecore_con_event_server_add_free, NULL);
-   efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
    _ecore_con_event_count++;
 }
 
@@ -1132,7 +1132,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
         Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
         event_info.data = e->data;
         event_info.size = e->size;
-        efl_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
+        efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
      }
    _ecore_con_event_count++;
 }
@@ -1157,7 +1157,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
    if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE;
    ecore_event_add(ev, e,
                    (Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server);
-   efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_UPGRADED, NULL);
    _ecore_con_event_count++;
 }
 
@@ -1239,7 +1239,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
         Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
         event_info.data = e->data;
         event_info.size = e->size;
-        efl_event_callback_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
+        efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_DATA_RECEIVED, &event_info);
      }
    _ecore_con_event_count++;
 }
@@ -1265,7 +1265,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
    DBG("%s", error);
    svr->event_count = eina_list_append(svr->event_count, e);
    ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL);
-   efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
+   efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
    _ecore_con_event_count++;
 }
 
@@ -1286,7 +1286,7 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
    cl->event_count = eina_list_append(cl->event_count, e);
    host_server->event_count = eina_list_append(host_server->event_count, e);
    ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server);
-   efl_event_callback_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
+   efl_event_callback_legacy_call(obj, EFL_NETWORK_EVENT_CONNECTION_ERROR, e->error);
    _ecore_con_event_count++;
 }
 
index c47ee5f..9c5a83c 100644 (file)
@@ -1140,7 +1140,7 @@ _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg)
    e.status = status;
    e.url_con = url_obj;
    url_con->event_count++;
-   efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e);
+   efl_event_callback_legacy_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e);
 }
 
 static void
@@ -1201,7 +1201,7 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp)
         e.size = real_size;
         e.data = buffer;
         url_con->event_count++;
-        efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e);
+        efl_event_callback_legacy_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e);
      }
    else
      {
@@ -1260,7 +1260,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u
    e.up.total = ultotal;
    e.up.now = ulnow;
    url_con->event_count++;
-   efl_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e);
+   efl_event_callback_legacy_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e);
 
    return 0;
 }
index b873106..2f51499 100644 (file)
@@ -253,7 +253,7 @@ _efl_net_dialer_http_curlm_check(Efl_Net_Dialer_Http_Curlm *cm)
                   DBG("HTTP dialer=%p error: #%d '%s'",
                       dialer, err, eina_error_msg_get(err));
                   pd->error = err;
-                  efl_event_callback_call(dialer, EFL_NET_DIALER_EVENT_ERROR, &err);
+                  efl_event_callback_legacy_call(dialer, EFL_NET_DIALER_EVENT_ERROR, &err);
                }
 
              if (msg->msg != CURLMSG_DONE) continue;
@@ -754,7 +754,7 @@ _efl_net_dialer_http_headers_done(Eo *o, Efl_Net_Dialer_Http_Data *pd)
    efl_net_dialer_http_response_content_type_set(o, s);
 
    pd->pending_headers_done = EINA_FALSE;
-   efl_event_callback_call(o, EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, NULL);
+   efl_event_callback_legacy_call(o, EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, NULL);
 }
 
 /* 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
     * allow_redirects will trigger more than once
     */
    pd->connected = connected;
-   if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL);
+   if (connected) efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL);
 }
 
 EOLIAN static Eina_Bool
@@ -1135,7 +1135,7 @@ EOLIAN static void
 _efl_net_dialer_http_efl_net_socket_address_remote_set(Eo *o, Efl_Net_Dialer_Http_Data *pd, const char *address)
 {
    if (eina_stringshare_replace(&pd->address_remote, address))
-     efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL);
+     efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL);
 }
 
 EOLIAN static const char *
@@ -1198,7 +1198,7 @@ _efl_net_dialer_http_efl_io_reader_can_read_set(Eo *o, Efl_Net_Dialer_Http_Data
    EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
    if (pd->can_read == can_read) return;
    pd->can_read = can_read;
-   efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
 }
 
 EOLIAN static Eina_Bool
@@ -1215,7 +1215,7 @@ _efl_net_dialer_http_efl_io_reader_eos_set(Eo *o, Efl_Net_Dialer_Http_Data *pd,
    pd->eos = is_eos;
    if (is_eos) pd->connected = EINA_FALSE;
    if (is_eos)
-     efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL);
+     efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL);
 }
 
 EOLIAN static Eina_Error
@@ -1289,7 +1289,7 @@ _efl_net_dialer_http_efl_io_writer_can_write_set(Eo *o, Efl_Net_Dialer_Http_Data
    EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
    if (pd->can_write == can_write) return;
    pd->can_write = can_write;
-   efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
 }
 
 EOLIAN static Eina_Error
@@ -1319,7 +1319,7 @@ _efl_net_dialer_http_efl_io_closer_close(Eo *o, Efl_Net_Dialer_Http_Data *pd)
    efl_io_reader_eos_set(o, EINA_FALSE);
    efl_net_dialer_connected_set(o, EINA_FALSE);
    pd->closed = EINA_TRUE;
-   efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
    return err;
 }
 
@@ -1631,7 +1631,7 @@ _efl_net_dialer_http_request_content_length_set(Eo *o, Efl_Net_Dialer_Http_Data
 
    pm = _efl_net_dialer_http_primary_mode_effective_get(pd);
    if (pm == EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD)
-     efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
+     efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
 }
 
 EOLIAN static int64_t
@@ -1651,7 +1651,7 @@ _efl_net_dialer_http_response_content_length_set(Eo *o, Efl_Net_Dialer_Http_Data
 
    pm = _efl_net_dialer_http_primary_mode_effective_get(pd);
    if (pm == EFL_NET_DIALER_HTTP_PRIMARY_MODE_DOWNLOAD)
-     efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
+     efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
 }
 
 EOLIAN static int64_t
index 88f78fe..bea0652 100644 (file)
@@ -115,7 +115,7 @@ _efl_net_dialer_tcp_efl_net_dialer_dial(Eo *o, Efl_Net_Dialer_Tcp_Data *pd EINA_
    if (efl_net_ip_port_fmt(buf, sizeof(buf), (struct sockaddr *)&addr))
      {
         efl_net_socket_address_remote_set(o, buf);
-        efl_event_callback_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL);
+        efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_RESOLVED, NULL);
      }
 
    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
 {
    if (pd->connected == connected) return;
    pd->connected = connected;
-   if (connected) efl_event_callback_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL);
+   if (connected) efl_event_callback_legacy_call(o, EFL_NET_DIALER_EVENT_CONNECTED, NULL);
 }
 
 EOLIAN static Eina_Bool
index 0365669..9d457f4 100644 (file)
@@ -90,7 +90,7 @@ _efl_net_server_fd_event_read(void *data EINA_UNUSED, const Eo_Event *event)
      {
         Eina_Error err = errno;
         ERR("accept(%d): %s", fd, strerror(errno));
-        efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err);
+        efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_ERROR, &err);
         return;
      }
 
@@ -107,7 +107,7 @@ _efl_net_server_fd_event_error(void *data EINA_UNUSED, const Eo_Event *event)
    Eina_Error err = EBADF;
 
    efl_net_server_serving_set(o, EINA_FALSE);
-   efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err);
+   efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_ERROR, &err);
 }
 
 EOLIAN static Efl_Object *
@@ -205,7 +205,7 @@ _efl_net_server_fd_efl_net_server_serving_set(Eo *o EINA_UNUSED, Efl_Net_Server_
    if (pd->serving == serving) return;
    pd->serving = serving;
    if (serving)
-     efl_event_callback_call(o, EFL_NET_SERVER_EVENT_SERVING, NULL);
+     efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_SERVING, NULL);
 }
 
 EOLIAN static Eina_Error
index b904cbb..23b670b 100644 (file)
@@ -135,7 +135,7 @@ _efl_net_server_tcp_efl_net_server_serve(Eo *o, void *pd EINA_UNUSED, const char
  error_listen:
    close(fd);
  error_socket:
-   efl_event_callback_call(o, EFL_NET_SERVER_EVENT_ERROR, &err);
+   efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_ERROR, &err);
    return err;
 }
 
@@ -171,7 +171,7 @@ _efl_net_server_tcp_efl_net_server_fd_client_add(Eo *o, void *pd EINA_UNUSED, in
      }
 
    efl_net_server_clients_count_set(o, efl_net_server_clients_count_get(o) + 1);
-   efl_event_callback_call(o, EFL_NET_SERVER_EVENT_CLIENT_ADD, client);
+   efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_CLIENT_ADD, client);
 
    if (efl_ref_get(client) == 1) /* users must take a reference themselves */
      {
@@ -195,7 +195,7 @@ _efl_net_server_tcp_efl_net_server_fd_client_reject(Eo *o, void *pd EINA_UNUSED,
      efl_net_ip_port_fmt(str, sizeof(str), (struct sockaddr *)&addr);
 
    close(client_fd);
-   efl_event_callback_call(o, EFL_NET_SERVER_EVENT_CLIENT_REJECTED, str);
+   efl_event_callback_legacy_call(o, EFL_NET_SERVER_EVENT_CLIENT_REJECTED, str);
 }
 
 #include "efl_net_server_tcp.eo.c"
index 73ffc0b..f67175f 100644 (file)
@@ -3110,7 +3110,7 @@ ecore_evas_animator_tick(Ecore_Evas *ee, Eina_Rectangle *viewport)
         a.update_area = *viewport;
      }
 
-   efl_event_callback_call(ee->evas, EFL_EVENT_ANIMATOR_TICK, &a);
+   efl_event_callback_legacy_call(ee->evas, EFL_EVENT_ANIMATOR_TICK, &a);
 
    // FIXME: We do not support partial animator in the subcanvas
    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
    ev->pressure = info->multi.pressure;
    ev->angle = info->multi.angle - ee->rotation;
 
-   efl_event_callback_call(e, _event_description_get(ev->action), evt);
+   efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
    efl_del(evt);
 
@@ -4444,7 +4444,7 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
    ev->pressure = info->multi.pressure;
    ev->angle = info->multi.angle - ee->rotation;
 
-   efl_event_callback_call(e, _event_description_get(ev->action), evt);
+   efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
    efl_del(evt);
 
@@ -4476,7 +4476,7 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info)
    ev->wheel.z = info->z;
    ev->wheel.dir = info->direction ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL;
 
-   efl_event_callback_call(e, _event_description_get(ev->action), evt);
+   efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
    efl_del(evt);
 
@@ -4503,7 +4503,7 @@ _direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointe
    ev->timestamp = info->timestamp;
    _pointer_position_set(ev, ee, info->x, info->y, info->x, info->y);
 
-   efl_event_callback_call(e, _event_description_get(ev->action), evt);
+   efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
    efl_del(evt);
 
@@ -4610,7 +4610,7 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
      }
    _pointer_position_set(ev, ee, x, y, x, y);
 
-   efl_event_callback_call(e, _event_description_get(ev->action), evt);
+   efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
    efl_del(evt);
 
@@ -4648,9 +4648,9 @@ _direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool dow
    ev->device = NULL; /* FIXME */
 
    if (down)
-     efl_event_callback_call(e, EFL_EVENT_KEY_DOWN, evt);
+     efl_event_callback_legacy_call(e, EFL_EVENT_KEY_DOWN, evt);
    else
-     efl_event_callback_call(e, EFL_EVENT_KEY_UP, evt);
+     efl_event_callback_legacy_call(e, EFL_EVENT_KEY_UP, evt);
 
    processed = ev->evas_done;
    efl_del(evt);
index 4992063..66c7508 100644 (file)
@@ -69,7 +69,7 @@ _ector_software_buffer_base_pixels_clear(Eo *obj, Ector_Software_Buffer_Base_Dat
         return;
      }
 
-   efl_event_callback_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8);
+   efl_event_callback_legacy_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8);
    if (!pd->nofree)
      {
         free(pd->pixels.u8);
index 43ebd68..a465559 100644 (file)
@@ -923,7 +923,7 @@ _edje_recalc_do(Edje *ed)
    if (!ed->calc_only)
      {
         if (ed->recalc_call)
-          efl_event_callback_call(ed->obj, EDJE_OBJECT_EVENT_RECALC, NULL);
+          efl_event_callback_legacy_call(ed->obj, EDJE_OBJECT_EVENT_RECALC, NULL);
      }
    else
      evas_object_smart_need_recalculate_set(ed->obj, need_calc);
index 49f59af..2260f24 100644 (file)
@@ -185,8 +185,8 @@ _efl_gfx_shape_path_set(Eo *obj, Efl_Gfx_Shape_Data *pd,
                                 &pd->current_ctrl.x, &pd->current_ctrl.y);
 
  end:
-   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static void
@@ -415,8 +415,8 @@ _efl_gfx_shape_interpolate(Eo *obj, Efl_Gfx_Shape_Data *pd,
    efl_gfx_shape_stroke_dash_set(obj, dash, property_to.dash_length);
    efl_gfx_shape_stroke_cap_set(obj, pos_map < 0.5 ? property_from.c : property_to.c);
    efl_gfx_shape_stroke_join_set(obj, pos_map < 0.5 ? property_from.j : property_to.j);
-   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
 
    return EINA_TRUE;
 }
@@ -450,8 +450,8 @@ _efl_gfx_shape_reset(Eo *obj, Efl_Gfx_Shape_Data *pd)
    pd->current_ctrl.x = 0;
    pd->current_ctrl.y = 0;
    pd->convex = EINA_FALSE;
-   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static void
@@ -470,8 +470,8 @@ _efl_gfx_shape_append_move_to(Eo *obj, Efl_Gfx_Shape_Data *pd,
    pd->current.x = x;
    pd->current.y = y;
 
-   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static void
@@ -490,8 +490,8 @@ _efl_gfx_shape_append_line_to(Eo *obj, Efl_Gfx_Shape_Data *pd,
    pd->current.x = x;
    pd->current.y = y;
 
-   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static void
@@ -518,8 +518,8 @@ _efl_gfx_shape_append_cubic_to(Eo *obj, Efl_Gfx_Shape_Data *pd,
    pd->current_ctrl.x = ctrl_x1;
    pd->current_ctrl.y = ctrl_y1;
 
-   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static void
@@ -1098,8 +1098,8 @@ _efl_gfx_shape_append_close(Eo *obj, Efl_Gfx_Shape_Data *pd)
    efl_gfx_path_grow(EFL_GFX_PATH_COMMAND_TYPE_CLOSE,
                      pd, &offset_point);
 
-   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static void
@@ -1822,8 +1822,8 @@ _efl_gfx_shape_dup(Eo *obj, Efl_Gfx_Shape_Data *pd, const Eo *dup_from)
    _efl_gfx_shape_stroke_dash_set(obj, pd, from->public.stroke.dash, from->public.stroke.dash_length);
    _efl_gfx_shape_path_set(obj, pd, from->commands, from->points);
 
-   efl_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL);
-   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_PATH_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 #include "interfaces/efl_gfx_shape.eo.c"
index 45f3ef5..04e5fdf 100644 (file)
@@ -39,7 +39,7 @@ _efl_io_buffer_realloc(Eo *o, Efl_Io_Buffer_Data *pd, size_t size)
 
         /* no efl_io_sizer_size_set() since it could recurse! */
         pd->used = size;
-        efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
+        efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
      }
 
    if (size == 0)
@@ -55,7 +55,7 @@ _efl_io_buffer_realloc(Eo *o, Efl_Io_Buffer_Data *pd, size_t size)
 
    pd->bytes = tmp;
    pd->allocated = size;
-   efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL);
    return EINA_TRUE;
 }
 
@@ -127,7 +127,7 @@ _efl_io_buffer_binbuf_steal(Eo *o, Efl_Io_Buffer_Data *pd)
 
    pd->bytes = NULL;
    pd->allocated = 0;
-   efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL);
    efl_io_sizer_resize(o, 0);
 
    return ret;
@@ -213,7 +213,7 @@ _efl_io_buffer_efl_io_reader_can_read_set(Eo *o, Efl_Io_Buffer_Data *pd, Eina_Bo
    EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
    if (pd->can_read == can_read) return;
    pd->can_read = can_read;
-   efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
 }
 
 EOLIAN static Eina_Bool
@@ -228,7 +228,7 @@ _efl_io_buffer_efl_io_reader_eos_set(Eo *o, Efl_Io_Buffer_Data *pd EINA_UNUSED,
 {
    EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
    if (is_eos)
-     efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL);
+     efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL);
 }
 
 EOLIAN static Eina_Error
@@ -273,7 +273,7 @@ _efl_io_buffer_efl_io_writer_write(Eo *o, Efl_Io_Buffer_Data *pd, Eina_Slice *sl
    if (pd->used < write_pos + todo)
      {
         pd->used = write_pos + todo;
-        efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
+        efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
         efl_io_reader_can_read_set(o, pd->position_read < pd->used);
      }
    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
    EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
    if (pd->can_write == can_write) return;
    pd->can_write = can_write;
-   efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
 }
 
 EOLIAN static Eina_Error
@@ -307,7 +307,7 @@ _efl_io_buffer_efl_io_closer_close(Eo *o, Efl_Io_Buffer_Data *pd)
    EINA_SAFETY_ON_TRUE_RETURN_VAL(efl_io_closer_closed_get(o), EINVAL);
    efl_io_sizer_resize(o, 0);
    pd->closed = EINA_TRUE;
-   efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
    return 0;
 }
 
@@ -359,9 +359,9 @@ _efl_io_buffer_efl_io_sizer_resize(Eo *o, Efl_Io_Buffer_Data *pd, uint64_t size)
         efl_io_writer_can_write_set(o, (limit == 0) || (pos_write < limit));
      }
 
-   efl_event_callback_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_SIZER_EVENT_SIZE_CHANGED, NULL);
    if (reallocated)
-     efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL);
+     efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_REALLOCATED, NULL);
 
    return ret;
 }
@@ -437,9 +437,9 @@ _efl_io_buffer_position_read_set(Eo *o, Efl_Io_Buffer_Data *pd, uint64_t positio
    changed = efl_io_positioner_position_get(o) != position;
 
    pd->position_read = position;
-   efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_POSITION_READ_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_POSITION_READ_CHANGED, NULL);
    if (changed)
-     efl_event_callback_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
+     efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
 
    efl_io_reader_can_read_set(o, position < size);
    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
    changed = efl_io_positioner_position_get(o) != position;
 
    pd->position_write = position;
-   efl_event_callback_call(o, EFL_IO_BUFFER_EVENT_POSITION_WRITE_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_BUFFER_EVENT_POSITION_WRITE_CHANGED, NULL);
    if (changed)
-     efl_event_callback_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
+     efl_event_callback_legacy_call(o, EFL_IO_POSITIONER_EVENT_POSITION_CHANGED, NULL);
 
    limit = efl_io_buffer_limit_get(o);
    efl_io_writer_can_write_set(o, (limit == 0) || (position < limit));
index a4dcf32..2420b86 100644 (file)
@@ -180,7 +180,7 @@ _efl_io_queue_limit_set(Eo *o, Efl_Io_Queue_Data *pd, size_t limit)
      }
 
    _efl_io_queue_adjust_and_realloc_if_needed(o, pd);
-   efl_event_callback_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL);
 
  end:
    _efl_io_queue_update_cans(o, pd);
@@ -216,7 +216,7 @@ _efl_io_queue_clear(Eo *o, Efl_Io_Queue_Data *pd)
    pd->position_read = 0;
    pd->position_write = 0;
    efl_io_reader_can_read_set(o, EINA_FALSE);
-   efl_event_callback_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL);
    if (pd->pending_eos)
      efl_io_reader_eos_set(o, EINA_TRUE);
 }
@@ -285,7 +285,7 @@ _efl_io_queue_efl_io_reader_read(Eo *o, Efl_Io_Queue_Data *pd, Eina_Rw_Slice *rw
    pd->position_read += ro_slice.len;
 
    efl_io_reader_can_read_set(o, pd->position_read < pd->position_write);
-   efl_event_callback_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL);
 
    if ((pd->pending_eos) && (efl_io_queue_usage_get(o) == 0))
      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
    EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
    if (pd->can_read == can_read) return;
    pd->can_read = can_read;
-   efl_event_callback_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_CAN_READ_CHANGED, NULL);
 }
 
 EOLIAN 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
    if (is_eos)
      {
         pd->pending_eos = EINA_FALSE;
-        efl_event_callback_call(o, EFL_IO_READER_EVENT_EOS, NULL);
+        efl_event_callback_legacy_call(o, EFL_IO_READER_EVENT_EOS, NULL);
      }
 }
 
@@ -384,7 +384,7 @@ _efl_io_queue_efl_io_writer_write(Eo *o, Efl_Io_Queue_Data *pd, Eina_Slice *slic
    pd->position_write += todo;
 
    _efl_io_queue_adjust_and_realloc_if_needed(o, pd);
-   efl_event_callback_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, NULL);
    _efl_io_queue_update_cans(o, pd);
 
    return 0;
@@ -407,7 +407,7 @@ _efl_io_queue_efl_io_writer_can_write_set(Eo *o, Efl_Io_Queue_Data *pd, Eina_Boo
    EINA_SAFETY_ON_TRUE_RETURN(efl_io_closer_closed_get(o));
    if (pd->can_write == can_write) return;
    pd->can_write = can_write;
-   efl_event_callback_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, NULL);
 }
 
 EOLIAN static Eina_Error
@@ -417,7 +417,7 @@ _efl_io_queue_efl_io_closer_close(Eo *o, Efl_Io_Queue_Data *pd)
    efl_io_queue_eos_mark(o);
    efl_io_queue_clear(o);
    pd->closed = EINA_TRUE;
-   efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
+   efl_event_callback_legacy_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL);
    return 0;
 }
 
index 3b32205..ec433e6 100644 (file)
@@ -94,7 +94,7 @@ efl_model_property_changed_notify(Efl_Model *model, const char *property)
    EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
 
    Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
-   efl_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
+   efl_event_callback_legacy_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
 
 on_error:
    eina_array_free(changed_properties);
@@ -110,7 +110,7 @@ efl_model_property_invalidated_notify(Efl_Model *model, const char *property)
    EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
 
    Efl_Model_Property_Event evt = {.invalidated_properties = invalidated_properties};
-   efl_event_callback_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
+   efl_event_callback_legacy_call(model, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
 
 on_error:
    eina_array_free(invalidated_properties);
index 37613fc..96887e3 100644 (file)
@@ -41,7 +41,7 @@ _efl_vpath_file_do(Eo *obj EINA_UNUSED, Efl_Vpath_File_Data *pd)
 {
    if (pd->called) return EINA_FALSE;
    pd->called = EINA_TRUE;
-   efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL);
    return EINA_TRUE;
 }
 
@@ -52,9 +52,9 @@ _efl_vpath_file_wait(Eo *obj EINA_UNUSED, Efl_Vpath_File_Data *pd EINA_UNUSED)
      {
         pd->called = EINA_TRUE;
         if (pd->result)
-          efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL);
+          efl_event_callback_legacy_call(obj, EFL_VPATH_FILE_EVENT_FETCHED, NULL);
         else
-          efl_event_callback_call(obj, EFL_VPATH_FILE_EVENT_FAILED, NULL);
+          efl_event_callback_legacy_call(obj, EFL_VPATH_FILE_EVENT_FAILED, NULL);
      }
 }
 
index 181af8c..81514f5 100644 (file)
@@ -124,7 +124,7 @@ _file_ls_filter_cb_helper(const Efl_Event_Description *event, void *data, const
    event_info->file = file;
    event_info->filter = EINA_FALSE;
 
-   efl_event_callback_call(operation->pdata->object, event, event_info);
+   efl_event_callback_legacy_call(operation->pdata->object, event, event_info);
 
    Eina_Bool filter = event_info->filter;
 
@@ -213,7 +213,7 @@ _file_direct_ls_filter_cb(void *data, Eio_File *handle EINA_UNUSED, const Eina_F
    event_info.info = info;
    event_info.filter = EINA_FALSE;
 
-   efl_event_callback_call(operation->pdata->object, EFL_IO_MANAGER_EVENT_FILTER_DIRECT, &event_info);
+   efl_event_callback_legacy_call(operation->pdata->object, EFL_IO_MANAGER_EVENT_FILTER_DIRECT, &event_info);
 
    Eina_Bool filter = event_info.filter;
 
index a7ab949..be6f094 100644 (file)
@@ -95,7 +95,7 @@ _eio_move_done_cb(void *data, Eio_File *handler EINA_UNUSED)
    eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]);
    evt.changed_properties = properties;
 
-   efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
+   efl_event_callback_legacy_call(priv->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
    eina_array_free(properties);
 }
 
@@ -180,7 +180,7 @@ _efl_model_evt_added_ecore_cb(void *data, int type, void *event)
    eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata);
    eina_value_flush(&path);
 
-   efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt);
+   efl_event_callback_legacy_call(priv->obj, EFL_MODEL_EVENT_CHILD_ADDED, &cevt);
 
    return EINA_TRUE;
 }
@@ -213,7 +213,7 @@ _efl_model_evt_deleted_ecore_cb(void *data, int type, void *event)
              cevt.index = i;
              cevt.child = cur->data;
 
-             efl_event_callback_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt);
+             efl_event_callback_legacy_call(priv->obj, EFL_MODEL_EVENT_CHILD_REMOVED, &cevt);
 
              priv->children_list = eina_list_remove_list(priv->children_list, cur);
              efl_unref(cevt.child);
index c21b0c2..153828e 100644 (file)
@@ -73,7 +73,7 @@ _handle_event(void *data, int type, void *event)
    event_info->source = eio_monitor_path_get(monitor_event->monitor);
    event_info->trigger = monitor_event->filename;
 
-   efl_event_callback_call(pd->object, translated_event, event_info);
+   efl_event_callback_legacy_call(pd->object, translated_event, event_info);
 
    // If event was error, we must delete the monitor.
    if (type == EIO_MONITOR_ERROR)
index f9f7f51..b784091 100644 (file)
@@ -290,7 +290,7 @@ eldbus_model_arguments_process_arguments(Eldbus_Model_Arguments_Data *pd,
    if (eina_array_count(changed_properties))
      {
         Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
-        efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
+        efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
      }
 
    result = EINA_TRUE;
index 465673a..558cb85 100644 (file)
@@ -341,7 +341,7 @@ _eldbus_model_connection_names_list_cb(void *data,
    count = eina_list_count(pd->children_list);
 
    if (count)
-     efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count);
+     efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count);
 
    pd->is_listed = EINA_TRUE;
 
index e36f941..5adc31b 100644 (file)
@@ -95,7 +95,7 @@ _eldbus_model_method_call_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendi
    Eldbus_Model_Arguments_Data *args_data = efl_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
 
    if (eldbus_model_arguments_process_arguments(args_data, msg, pending))
-     efl_event_callback_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL);
+     efl_event_callback_legacy_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL);
 }
 
 #include "eldbus_model_method.eo.c"
index 54eb6c6..0b5ba49 100644 (file)
@@ -620,7 +620,7 @@ _eldbus_model_proxy_property_get_all_cb(void *data,
           .changed_properties = changed_properties
         };
 
-        efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
+        efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
      }
 
    eina_array_free(changed_properties);
@@ -686,7 +686,7 @@ _eldbus_model_proxy_property_set_cb(void *data,
                          .changed_properties = pd->properties_array
                        };
 
-               efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
+               efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
                efl_model_property_changed_notify(pd->obj, property_set_data->property);
 
            }
index 0688119..c8124d0 100644 (file)
@@ -29,7 +29,7 @@ _child_added_cb_proxy(void *data, const Eo_Event *event)
    Evas_Object *box = data;
    Evas_Object_Box_Option *opt = event->info;
 
-   efl_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_ADDED, opt->obj);
+   efl_event_callback_legacy_call(box, EFL_CONTAINER_EVENT_CONTENT_ADDED, opt->obj);
 }
 
 static void
@@ -38,7 +38,7 @@ _child_removed_cb_proxy(void *data, const Eo_Event *event)
    Evas_Object *box = data;
    Evas_Object *child = event->info;
 
-   efl_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child);
+   efl_event_callback_legacy_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child);
 }
 
 EOLIAN static Eina_Bool
@@ -151,7 +151,7 @@ EOLIAN static void
 _efl_ui_box_efl_pack_layout_layout_update(Eo *obj, Efl_Ui_Box_Data *pd)
 {
    efl_pack_layout_do(pd->layout_engine, obj, pd->layout_data);
-   efl_event_callback_call(obj, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL);
 }
 
 EOLIAN static void
index 5dc8214..08adc4f 100644 (file)
@@ -1337,7 +1337,7 @@ _flip(Evas_Object *obj)
           sd->state = sd->next_state;
         _configure(obj);
         _flip_show_hide(obj);
-        efl_event_callback_call(obj, EFL_UI_FLIP_EVENT_ANIMATE_DONE, NULL);
+        efl_event_callback_legacy_call(obj, EFL_UI_FLIP_EVENT_ANIMATE_DONE, NULL);
 
         // update the new front and back object.
         _update_front_back(obj, sd);
@@ -1521,7 +1521,7 @@ _event_anim(void *data,
    _flip_show_hide(sd->obj);
    _configure(sd->obj);
    sd->animator = NULL;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, EFL_UI_FLIP_EVENT_ANIMATE_DONE, NULL);
 
    return ECORE_CALLBACK_CANCEL;
@@ -1708,7 +1708,7 @@ _move_cb(void *data,
              evas_smart_objects_calculate(evas_object_evas_get(data));
              _configure(fl);
              // FIXME: end hack
-             efl_event_callback_call(fl, EFL_UI_FLIP_EVENT_ANIMATE_BEGIN, NULL);
+             efl_event_callback_legacy_call(fl, EFL_UI_FLIP_EVENT_ANIMATE_BEGIN, NULL);
           }
         else return;
      }
@@ -1928,7 +1928,7 @@ _internal_elm_flip_go_to(Evas_Object *obj,
    evas_smart_objects_calculate(evas_object_evas_get(obj));
    _configure(obj);
    // FIXME: end hack
-   efl_event_callback_call(obj, EFL_UI_FLIP_EVENT_ANIMATE_BEGIN, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_FLIP_EVENT_ANIMATE_BEGIN, NULL);
 
    // set focus to the content object when flip go to is called
    if (elm_object_focus_get(obj))
index 3b19afe..5e89c04 100644 (file)
@@ -136,7 +136,7 @@ _on_frame_clicked(void *data,
         sd->collapsed++;
         sd->anim = EINA_TRUE;
      }
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
@@ -246,7 +246,7 @@ _efl_ui_frame_collapse_go(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
    if (sd->collapsed == collapse) return;
 
    elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, obj);
    sd->collapsed = collapse;
    sd->anim = EINA_TRUE;
index c402d36..3b673e9 100644 (file)
@@ -127,7 +127,7 @@ _efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
 static void
 _layout_updated_emit(Efl_Ui_Grid *obj)
 {
-   efl_event_callback_call(obj, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_PACK_EVENT_LAYOUT_UPDATED, NULL);
 }
 
 static void
@@ -408,7 +408,7 @@ _pack_at(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj,
 
         efl_key_data_set(subobj, GRID_ITEM_KEY, gi);
         elm_widget_sub_object_add(obj, subobj);
-        efl_event_callback_call(obj, EFL_CONTAINER_EVENT_CONTENT_ADDED, subobj);
+        efl_event_callback_legacy_call(obj, EFL_CONTAINER_EVENT_CONTENT_ADDED, subobj);
         efl_event_callback_array_add(subobj, subobj_callbacks(), obj);
      }
 
@@ -514,7 +514,7 @@ _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj)
      }
 
 end:
-   efl_event_callback_call(obj, EFL_CONTAINER_EVENT_CONTENT_REMOVED, subobj);
+   efl_event_callback_legacy_call(obj, EFL_CONTAINER_EVENT_CONTENT_REMOVED, subobj);
    pd->items = (Grid_Item *)
          eina_inlist_remove(EINA_INLIST_GET(pd->items), EINA_INLIST_GET(gi));
    pd->count--;
index a392b6e..3c697aa 100644 (file)
@@ -78,7 +78,7 @@ _on_mouse_up(void *data,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (!wd->still_in) return;
 
-   efl_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static Eina_Bool
@@ -380,7 +380,7 @@ _efl_ui_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
         ERR("Async open failed for an unknown reason.");
         sd->async_failed = EINA_TRUE;
         eina_spinlock_release(&sd->async.lck);
-        efl_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL);
+        efl_event_callback_legacy_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL);
         return;
      }
 
@@ -410,7 +410,7 @@ _efl_ui_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
         sd->async_failed = EINA_FALSE;
         ELM_SAFE_FREE(sd->async.file, eina_stringshare_del);
         ELM_SAFE_FREE(sd->async.key, eina_stringshare_del);
-        efl_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_OPENED, NULL);
+        efl_event_callback_legacy_call(obj, EFL_FILE_EVENT_ASYNC_OPENED, NULL);
         _efl_ui_image_internal_sizing_eval(obj, sd);
      }
    else
@@ -418,7 +418,7 @@ _efl_ui_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
         // TODO: Implement Efl.File async,error event_info type
         sd->async_failed = EINA_TRUE;
         // keep file,key around for file_get
-        efl_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL);
+        efl_event_callback_legacy_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL);
      }
 
    // close f, map and free strings
@@ -565,7 +565,7 @@ _efl_ui_image_drag_n_drop_cb(void *elm_obj,
         DBG("dnd: %s, %s, %s", elm_widget_type_get(elm_obj),
               SIG_DND, (char *)drop->data);
 
-        efl_event_callback_call(elm_obj, EFL_UI_IMAGE_EVENT_DROP, drop->data);
+        efl_event_callback_legacy_call(elm_obj, EFL_UI_IMAGE_EVENT_DROP, drop->data);
         return EINA_TRUE;
      }
 
@@ -747,7 +747,7 @@ _efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
 static Eina_Bool
 _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_CLICKED, NULL);
    return EINA_TRUE;
 }
 
@@ -977,7 +977,7 @@ _efl_ui_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *downloa
 
         free(sd->remote_data);
         sd->remote_data = NULL;
-        efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
+        efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
      }
    else
      {
@@ -987,7 +987,7 @@ _efl_ui_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *downloa
              evas_object_image_preload(sd->img, EINA_FALSE);
           }
 
-        efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_DONE, NULL);
+        efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_DONE, NULL);
      }
 
    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
    Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    Efl_Ui_Image_Error err = { error, EINA_FALSE };
 
-   efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
+   efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
 
    sd->remote = NULL;
    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
 
    progress.now = now;
    progress.total = total;
-   efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_PROGRESS, &progress);
+   efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_PROGRESS, &progress);
 }
 
 static 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
                                         obj);
           if (sd->remote)
             {
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                      (obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_START, NULL);
                eina_stringshare_replace(&sd->key, key);
                return EINA_TRUE;
index 6a98319..e531382 100644 (file)
@@ -357,7 +357,7 @@ _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_U
 
    char *tmp = efl_canvas_text_range_text_get(obj, en->sel_start, en->sel_end);
 
-   efl_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
+   efl_event_callback_legacy_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
 
    free(tmp);
 
@@ -506,7 +506,7 @@ _sel_cursor_changed(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Efl_Canvas_Text_Cursor *obj = data;
 
-   efl_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL);
 }
 
 static void
@@ -597,7 +597,7 @@ _range_del_emit(Evas_Object *obj, Efl_Canvas_Text_Cursor *cur1, Efl_Canvas_Text_
    tmp = efl_canvas_text_range_text_get(obj, cur1, cur2);
    info.content = tmp;
 
-   efl_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
+   efl_event_callback_legacy_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
 
    if (tmp) free(tmp);
 
@@ -628,7 +628,7 @@ _delete_emit(Evas_Textblock_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data *en
    info.length = 1;
    info.content = tmp;
 
-   efl_event_callback_call((Eo *) efl_canvas_text_cursor_text_object_get(c),
+   efl_event_callback_legacy_call((Eo *) efl_canvas_text_cursor_text_object_get(c),
          EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
    if (tmp) free(tmp);
 
@@ -1016,7 +1016,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
              info.position = efl_canvas_text_cursor_position_get(cur);
              info.length = eina_unicode_utf8_get_len(string);
 
-             efl_event_callback_call(obj,
+             efl_event_callback_legacy_call(obj,
                    EFL_UI_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
 
              efl_canvas_text_cursor_text_insert(cur, string);
index 254b252..4f5f89c 100644 (file)
@@ -58,7 +58,7 @@ _state_active(Evas_Object *obj, Efl_Ui_Nstate_Data *sd)
    elm_layout_signal_emit(obj, buf, "elm");
    edje_object_message_signal_process(elm_layout_edje_get(obj));
    elm_obj_layout_sizing_eval(obj);
-   efl_event_callback_call(obj, EFL_UI_NSTATE_EVENT_STATE_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_NSTATE_EVENT_STATE_CHANGED, NULL);
 }
 
 static void
index b0c17a0..8475fdf 100644 (file)
@@ -443,7 +443,7 @@ _validate(Evas_Object *obj)
    if (sd->validators == 0) return;
 
    vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text");
-   res = efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc);
+   res = efl_event_callback_legacy_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc);
    buf = eina_strbuf_new();
    eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass");
    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)
    evas_event_thaw(evas_object_evas_get(obj));
    evas_event_thaw_eval(evas_object_evas_get(obj));
 
-   efl_event_callback_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
 
    evas_object_unref(obj);
 
@@ -1034,7 +1034,7 @@ _cursor_geometry_recalc(Evas_Object *obj)
 {
    EFL_UI_TEXT_DATA_GET(obj, sd);
 
-   efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_TEXT_EVENT_CURSOR_CHANGED, NULL);
 
    Evas_Coord x, y, w, h;
    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
         if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand &&
             !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
-        efl_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
+        efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
         _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
         if (top && top_is_win && sd->input_panel_enable &&
             !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
-        efl_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
+        efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 
@@ -1384,7 +1384,7 @@ _paste_cb(Eo *obj)
 
    EFL_UI_TEXT_DATA_GET(obj, sd);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SELECTION_PASTE, NULL);
 
    sd->selection_asked = EINA_TRUE;
@@ -1449,7 +1449,7 @@ _cut_cb(Eo *obj)
    Efl_Canvas_Text_Cursor *start, *end;
    EFL_UI_TEXT_DATA_GET(obj, sd);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SELECTION_CUT, NULL);
    /* Store it */
    sd->sel_mode = EINA_FALSE;
@@ -1479,7 +1479,7 @@ _copy_cb(Eo *obj)
 {
    EFL_UI_TEXT_DATA_GET(obj, sd);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SELECTION_COPY, NULL);
    sd->sel_mode = EINA_FALSE;
    if (!_elm_config->desktop_entry)
@@ -1539,7 +1539,7 @@ _menu_call(Evas_Object *obj)
 
    if (sd->anchor_hover.hover) return;
 
-   efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_CONTEXT_OPEN, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_TEXT_EVENT_CONTEXT_OPEN, NULL);
 
    if ((sd->api) && (sd->api->obj_longpress))
      {
@@ -1822,7 +1822,7 @@ _long_press_cb(void *data)
    sd->long_pressed = EINA_TRUE;
 
    sd->longpress_timer = NULL;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_LONGPRESSED, NULL);
 
    return ECORE_CALLBACK_CANCEL;
@@ -2069,7 +2069,7 @@ _entry_changed_handle(void *data,
    /* callback - this could call callbacks that delete the
     * entry... thus... any access to sd after this could be
     * invalid */
-   efl_event_callback_call(data, event, NULL);
+   efl_event_callback_legacy_call(data, event, NULL);
 }
 
 static void
@@ -2085,11 +2085,11 @@ _entry_changed_user_signal_cb(void *data,
    if (edje_info)
      {
         memcpy(&info, edje_info, sizeof(info));
-        efl_event_callback_call(data, EFL_UI_TEXT_EVENT_CHANGED_USER, &info);
+        efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_CHANGED_USER, &info);
      }
    else
      {
-        efl_event_callback_call(data, EFL_UI_TEXT_EVENT_CHANGED_USER, NULL);
+        efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_CHANGED_USER, NULL);
      }
    if (_elm_config->atspi_mode)
      {
@@ -2126,7 +2126,7 @@ _entry_undo_request_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, EFL_UI_TEXT_EVENT_UNDO_REQUEST, NULL);
+   efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_UNDO_REQUEST, NULL);
 }
 
 static void
@@ -2135,7 +2135,7 @@ _entry_redo_request_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, EFL_UI_TEXT_EVENT_REDO_REQUEST, NULL);
+   efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_REDO_REQUEST, NULL);
 }
 
 static void
@@ -2161,7 +2161,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
                                        const char *emission EINA_UNUSED,
                                        const char *source EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL);
    if (_elm_config->atspi_mode)
      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,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_DOWN, &ei);
+     efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ANCHOR_DOWN, &ei);
 }
 
 static void
@@ -2243,7 +2243,7 @@ _entry_anchor_up_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_UP, &ei);
+     efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ANCHOR_UP, &ei);
 }
 
 static void
@@ -2324,7 +2324,7 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
         ei.hover_right = tmp;
      }
 
-   efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_ANCHOR_HOVER_OPENED, &ei);
+   efl_event_callback_legacy_call(obj, EFL_UI_TEXT_EVENT_ANCHOR_HOVER_OPENED, &ei);
    efl_event_callback_add
      (sd->anchor_hover.hover, EFL_UI_EVENT_CLICKED, _anchor_hover_clicked_cb, obj);
 
@@ -2364,7 +2364,7 @@ _entry_anchor_clicked_signal_cb(void *data,
 
    if (!sd->disabled)
      {
-        efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_CLICKED, &ei);
+        efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ANCHOR_CLICKED, &ei);
         _entry_hover_anchor_clicked_do(data, &ei);
      }
 }
@@ -2394,7 +2394,7 @@ _entry_anchor_in_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_IN, &ei);
+     efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ANCHOR_IN, &ei);
 }
 
 static void
@@ -2414,7 +2414,7 @@ _entry_anchor_out_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ANCHOR_OUT, &ei);
+     efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ANCHOR_OUT, &ei);
 }
 
 static void
@@ -2423,7 +2423,7 @@ _entry_key_enter_signal_cb(void *data,
                            const char *emission EINA_UNUSED,
                            const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ACTIVATED, NULL);
+   efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ACTIVATED, NULL);
 }
 
 static void
@@ -2432,7 +2432,7 @@ _entry_key_escape_signal_cb(void *data,
                             const char *emission EINA_UNUSED,
                             const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, EFL_UI_TEXT_EVENT_ABORTED, NULL);
+   efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_ABORTED, NULL);
 }
 
 static void
@@ -2441,7 +2441,7 @@ _entry_mouse_down_signal_cb(void *data,
                             const char *emission EINA_UNUSED,
                             const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, EFL_UI_TEXT_EVENT_PRESS, NULL);
+   efl_event_callback_legacy_call(data, EFL_UI_TEXT_EVENT_PRESS, NULL);
 }
 
 static void
@@ -2450,7 +2450,7 @@ _entry_mouse_clicked_signal_cb(void *data,
                                const char *emission EINA_UNUSED,
                                const char *source EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
@@ -2460,7 +2460,7 @@ _entry_mouse_double_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
 }
 
@@ -2470,7 +2470,7 @@ _entry_mouse_triple_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_CLICKED_TRIPLE, NULL);
 }
 
@@ -2623,7 +2623,7 @@ _text_append_idler(void *data)
         free(sd->append_text_left);
         sd->append_text_left = NULL;
         sd->append_text_idler = NULL;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, EFL_UI_TEXT_EVENT_TEXT_SET_DONE, NULL);
         return ECORE_CALLBACK_CANCEL;
      }
@@ -2783,7 +2783,7 @@ _entry_text_append(Evas_Object* obj, const char* entry, Eina_Bool set)
                }
              edje_object_part_text_cursor_pos_set(sd->entry_edje, "elm.text",
                    EDJE_CURSOR_MAIN, sd->cursor_pos);
-             efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_TEXT_SET_DONE, NULL);
+             efl_event_callback_legacy_call(obj, EFL_UI_TEXT_EVENT_TEXT_SET_DONE, NULL);
           }
      }
 }
@@ -3723,7 +3723,7 @@ _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
         edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm");
      }
    if (sd->have_selection)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
 
    sd->have_selection = EINA_FALSE;
@@ -3937,7 +3937,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
 {
    EFL_UI_TEXT_DATA_GET(obj, sd);
    /* here we need to emit the signal that the elm_scroller would have done */
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL, NULL);
 
    if (sd->have_selection)
@@ -4283,7 +4283,7 @@ _efl_ui_text_elm_widget_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Elm
    if (!elm_widget_disabled_get(obj) &&
        !evas_object_freeze_events_get(obj))
      {
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, EFL_UI_EVENT_CLICKED, NULL);
         if (sd->editable && sd->input_panel_enable)
           edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text");
index 1177bec..76d0762 100644 (file)
@@ -65,7 +65,7 @@ static const Elm_Win_Trap *trap = NULL;
          {                                                      \
             edje_object_signal_emit(cursd->edje, \
                         "elm,action,hide_blocker", "elm");      \
-            efl_event_callback_call(cursd->main_menu, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL); \
+            efl_event_callback_legacy_call(cursd->main_menu, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL); \
          }                                                      \
     }
 
@@ -81,7 +81,7 @@ static const Elm_Win_Trap *trap = NULL;
          {                                                      \
             edje_object_signal_emit(cursd->edje, \
                              "elm,action,show_blocker", "elm"); \
-            efl_event_callback_call(cursd->main_menu, EFL_UI_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); \
+            efl_event_callback_legacy_call(cursd->main_menu, EFL_UI_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); \
          }                                                      \
     }
 
@@ -840,7 +840,7 @@ _elm_win_move(Ecore_Evas *ee)
    ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
    sd->screen.x = x;
    sd->screen.y = y;
-   efl_event_callback_call(sd->obj, EFL_GFX_EVENT_MOVE, NULL);
+   efl_event_callback_legacy_call(sd->obj, EFL_GFX_EVENT_MOVE, NULL);
    evas_nochange_push(evas_object_evas_get(sd->obj));
    sd->response++;
    evas_object_move(sd->obj, x, y);
@@ -1293,7 +1293,7 @@ _elm_win_profile_update(Efl_Ui_Win_Data *sd)
    EINA_LIST_FOREACH(sub, l, ee2)
      ecore_evas_window_profile_set(ee2, sd->profile.name);
 
-   efl_event_callback_call(sd->obj, EFL_UI_WIN_EVENT_PROFILE_CHANGED, NULL);
+   efl_event_callback_legacy_call(sd->obj, EFL_UI_WIN_EVENT_PROFILE_CHANGED, NULL);
 }
 
 #ifdef HAVE_ELEMENTARY_WL2
@@ -1446,16 +1446,16 @@ _elm_win_state_change(Ecore_Evas *ee)
    if ((ch_withdrawn) || (ch_iconified))
      {
         if (sd->withdrawn)
-          efl_event_callback_call(obj, EFL_UI_WIN_EVENT_WITHDRAWN, NULL);
+          efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_WITHDRAWN, NULL);
         else if (sd->iconified)
           {
-             efl_event_callback_call(obj, EFL_UI_WIN_EVENT_ICONIFIED, NULL);
+             efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_ICONIFIED, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_minimized_signal_emit(obj);
           }
         else
           {
-             efl_event_callback_call(obj, EFL_UI_WIN_EVENT_NORMAL, NULL);
+             efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_NORMAL, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_restored_signal_emit(obj);
           }
@@ -1463,9 +1463,9 @@ _elm_win_state_change(Ecore_Evas *ee)
    if (ch_sticky)
      {
         if (sd->sticky)
-          efl_event_callback_call(obj, EFL_UI_WIN_EVENT_STICK, NULL);
+          efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_STICK, NULL);
         else
-          efl_event_callback_call(obj, EFL_UI_WIN_EVENT_UNSTICK, NULL);
+          efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_UNSTICK, NULL);
      }
    if (ch_fullscreen)
      {
@@ -1489,7 +1489,7 @@ _elm_win_state_change(Ecore_Evas *ee)
              if (need_frame)
                sd->wl.opaque_dirty = 1;
 #endif
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                (obj, EFL_UI_WIN_EVENT_FULLSCREEN, NULL);
           }
         else
@@ -1501,7 +1501,7 @@ _elm_win_state_change(Ecore_Evas *ee)
                   _elm_win_frame_obj_update(sd);
                }
 #endif
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                (obj, EFL_UI_WIN_EVENT_UNFULLSCREEN, NULL);
           }
      }
@@ -1509,13 +1509,13 @@ _elm_win_state_change(Ecore_Evas *ee)
      {
         if (sd->maximized)
           {
-             efl_event_callback_call(obj, EFL_UI_WIN_EVENT_MAXIMIZED, NULL);
+             efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_MAXIMIZED, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_maximized_signal_emit(obj);
           }
         else
           {
-             efl_event_callback_call(obj, EFL_UI_WIN_EVENT_UNMAXIMIZED, NULL);
+             efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_UNMAXIMIZED, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_restored_signal_emit(obj);
           }
@@ -1534,9 +1534,9 @@ _elm_win_state_change(Ecore_Evas *ee)
         _elm_win_xwin_update(sd);
 #endif
         elm_widget_orientation_set(obj, sd->rot);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, EFL_UI_WIN_EVENT_WM_ROTATION_CHANGED, NULL);
      }
 }
@@ -1678,7 +1678,7 @@ _evas_event_key_cb(void *data, const Eo_Event *ev)
    if (evas_focus_get(evas_object_evas_get(win)) == win)
      return;
 
-   efl_event_callback_call(win, ev->desc, evt);
+   efl_event_callback_legacy_call(win, ev->desc, evt);
 }
 
 static void
@@ -1692,7 +1692,7 @@ _evas_event_pointer_cb(void *data, const Eo_Event *ev)
    if (!evdata || evdata->win_fed)
      return;
 
-   efl_event_callback_call(win, ev->desc, evt);
+   efl_event_callback_legacy_call(win, ev->desc, evt);
 }
 
 /* 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)
      return;
    evdata->win_fed = EINA_TRUE;
 
-   efl_event_callback_call(evas, ev->desc, evt);
+   efl_event_callback_legacy_call(evas, ev->desc, evt);
    evdata->win_fed = EINA_FALSE;
    evdata->evas_done = EINA_FALSE;
 }
@@ -1731,7 +1731,7 @@ _evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
      return;
    evdata->win_fed = EINA_TRUE;
 
-   efl_event_callback_call(evas, ev->desc, evt);
+   efl_event_callback_legacy_call(evas, ev->desc, evt);
    evdata->win_fed = EINA_FALSE;
    evdata->evas_done = EINA_FALSE;
 }
@@ -1756,7 +1756,7 @@ _elm_win_evas_render_post(void *data,
    Efl_Gfx_Event_Render_Post *ev = event_info;
    Eo *win = data;
 
-   efl_event_callback_call(win, EFL_CANVAS_EVENT_RENDER_POST, ev);
+   efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_RENDER_POST, ev);
 }
 
 static void
@@ -1768,7 +1768,7 @@ _elm_win_evas_render_pre(void *data,
    Eo *win = data;
 
    _elm_win_throttle_ok = EINA_TRUE;
-   efl_event_callback_call(win, EFL_CANVAS_EVENT_RENDER_PRE, NULL);
+   efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_RENDER_PRE, NULL);
 }
 
 static void
@@ -1780,7 +1780,7 @@ _elm_win_evas_focus_in(void *data,
    Eo *win = data;
 
    _elm_win_throttle_ok = EINA_TRUE;
-   efl_event_callback_call(win, EFL_CANVAS_EVENT_FOCUS_IN, NULL);
+   efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_FOCUS_IN, NULL);
 }
 
 static void
@@ -1791,7 +1791,7 @@ _elm_win_evas_focus_out(void *data,
 {
    Eo *win = data;
 
-   efl_event_callback_call(win, EFL_CANVAS_EVENT_FOCUS_OUT, NULL);
+   efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_FOCUS_OUT, NULL);
 }
 
 static void
@@ -1804,7 +1804,7 @@ _elm_win_evas_object_focus_in(void *data,
    Eo *win = data;
 
    _elm_win_throttle_ok = EINA_TRUE;
-   efl_event_callback_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_IN, object);
+   efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_IN, object);
 }
 
 static void
@@ -1816,7 +1816,7 @@ _elm_win_evas_object_focus_out(void *data,
    Eo *object = event_info;
    Eo *win = data;
 
-   efl_event_callback_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT, object);
+   efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT, object);
 }
 
 static void
@@ -1828,7 +1828,7 @@ _elm_win_evas_device_changed(void *data,
    Eo *device = event_info;
    Eo *win = data;
 
-   efl_event_callback_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device);
+   efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device);
 }
 
 static void
@@ -2594,7 +2594,7 @@ _efl_ui_win_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord
           {
              sd->screen.x = x;
              sd->screen.y = y;
-             efl_event_callback_call(obj, EFL_GFX_EVENT_MOVE, NULL);
+             efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_MOVE, NULL);
           }
         return;
      }
@@ -2610,7 +2610,7 @@ _efl_ui_win_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord
      {
         sd->screen.x = x;
         sd->screen.y = y;
-        efl_event_callback_call(obj, EFL_GFX_EVENT_MOVE, NULL);
+        efl_event_callback_legacy_call(obj, EFL_GFX_EVENT_MOVE, NULL);
      }
    if (sd->frame_obj)
      {
@@ -2664,7 +2664,7 @@ _elm_win_delete_request(Ecore_Evas *ee)
    int autodel = sd->autodel;
    sd->autodel_clear = &autodel;
    evas_object_ref(obj);
-   efl_event_callback_call(obj, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL);
    if (sd->autohide)
      evas_object_hide(obj);
    // FIXME: if above callback deletes - then the below will be invalid
@@ -3228,7 +3228,7 @@ _elm_win_property_change(void *data,
         if (e->win == sd->x.xwin)
           {
              sd->indmode = (Elm_Win_Indicator_Mode)ecore_x_e_illume_indicator_state_get(e->win);
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                (sd->obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
           }
      }
@@ -3589,7 +3589,7 @@ _elm_win_frame_cb_close(void *data,
    int autodel = sd->autodel;
    sd->autodel_clear = &autodel;
    evas_object_ref(win);
-   efl_event_callback_call(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL);
+   efl_event_callback_legacy_call(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, NULL);
    if (sd->autohide)
      evas_object_hide(win);
    // FIXME: if above callback deletes - then the below will be invalid
@@ -3841,7 +3841,7 @@ _elm_x_io_err(void *data EINA_UNUSED)
    Evas_Object *obj;
 
    EINA_LIST_FOREACH(_elm_win_list, l, obj)
-     efl_event_callback_call(obj, EFL_UI_WIN_EVENT_IOERR, NULL);
+     efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_IOERR, NULL);
    elm_exit();
 }
 #endif
@@ -5354,7 +5354,7 @@ _win_rotate(Evas_Object *obj, Efl_Ui_Win_Data *sd, int rotation, Eina_Bool resiz
 #endif
    _elm_win_frame_obj_update(sd);
    elm_widget_orientation_set(obj, rotation);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL);
 }
 
@@ -5610,7 +5610,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
    edje_object_scale_set(sd->edje,
                          elm_widget_scale_get(obj) * elm_config_scale_get());
 
-   efl_event_callback_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL);
    ret = elm_obj_widget_disable(obj);
 
    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)
             (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF);
      }
 #endif
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
 }
 
@@ -6333,7 +6333,7 @@ elm_win_indicator_opacity_set(Evas_Object *obj, Elm_Win_Indicator_Opacity_Mode m
             (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_TRANSPARENT);
      }
 #endif
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
 }
 
index c545193..6fec7a7 100644 (file)
@@ -119,7 +119,7 @@ _hover_end_finished(void *data,
      {
         sd->expanded = EINA_FALSE;
         evas_object_hide(sd->hover);
-        efl_event_callback_call(data, ELM_COMBOBOX_EVENT_DISMISSED, NULL);
+        efl_event_callback_legacy_call(data, ELM_COMBOBOX_EVENT_DISMISSED, NULL);
      }
 }
 
@@ -194,7 +194,7 @@ _activate(Evas_Object *obj)
    evas_object_show(sd->genlist);
    elm_genlist_item_selected_set(sd->item, EINA_TRUE);
    evas_object_show(sd->hover);
-   efl_event_callback_call(obj, ELM_COMBOBOX_EVENT_EXPANDED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_COMBOBOX_EVENT_EXPANDED, NULL);
 }
 
 static void
@@ -203,13 +203,13 @@ _on_item_selected(void *data , Evas_Object *obj EINA_UNUSED, void *event)
    ELM_COMBOBOX_DATA_GET(data, sd);
    elm_object_focus_set(sd->entry, EINA_TRUE);
 
-   efl_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_SELECTED, event);
+   efl_event_callback_legacy_call(data, ELM_COMBOBOX_EVENT_ITEM_SELECTED, event);
 }
 
 static void
 _on_item_pressed(void *data , Evas_Object *obj EINA_UNUSED, void *event)
 {
-   efl_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_PRESSED, event);
+   efl_event_callback_legacy_call(data, ELM_COMBOBOX_EVENT_ITEM_PRESSED, event);
 }
 
 static void
@@ -226,7 +226,7 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event)
         return;
      }
 
-   efl_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info);
+   efl_event_callback_legacy_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info);
 
    if (sd->count > 0)
      {
@@ -254,7 +254,7 @@ _on_aborted(void *data, const Eo_Event *event EINA_UNUSED)
 static void
 _on_changed(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   efl_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -415,7 +415,7 @@ _elm_combobox_hover_end(Eo *obj, Elm_Combobox_Data *sd)
      {
         sd->expanded = EINA_FALSE;
         evas_object_hide(sd->hover);
-        efl_event_callback_call(obj, ELM_COMBOBOX_EVENT_DISMISSED, NULL);
+        efl_event_callback_legacy_call(obj, ELM_COMBOBOX_EVENT_DISMISSED, NULL);
      } // for backward compatibility
 }
 
@@ -461,7 +461,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
      elm_combobox_hover_begin(obj);
    else
      {
-        efl_event_callback_call(sd->genlist, EFL_UI_EVENT_PRESSED, sd->item);
+        efl_event_callback_legacy_call(sd->genlist, EFL_UI_EVENT_PRESSED, sd->item);
         elm_entry_cursor_end_set(sd->entry);
      }
    return EINA_TRUE;
index 6fcebde..05a62b0 100644 (file)
@@ -670,7 +670,7 @@ _elm_ctxpopup_elm_layout_sizing_eval(Eo *obj, Elm_Ctxpopup_Data *sd)
 
    _show_signals_emit(obj, sd->dir);
 
-   efl_event_callback_call(obj, ELM_CTXPOPUP_EVENT_GEOMETRY_UPDATE, &rect);
+   efl_event_callback_legacy_call(obj, ELM_CTXPOPUP_EVENT_GEOMETRY_UPDATE, &rect);
 }
 
 static void
@@ -708,7 +708,7 @@ _on_parent_resize(void *data,
         sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
 
         evas_object_hide(data);
-        efl_event_callback_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL);
+        efl_event_callback_legacy_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL);
      }
    else
      {
@@ -1011,7 +1011,7 @@ _hide_finished_cb(void *data,
                   const char *source EINA_UNUSED)
 {
    evas_object_hide(data);
-   efl_event_callback_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL);
+   efl_event_callback_legacy_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL);
 }
 
 static void
index 0cf92b7..414bb85 100644 (file)
@@ -624,7 +624,7 @@ _signal_first(Listing_Request *lreq)
      }
 
    // EVENTS: should not call legacy
-   //efl_event_callback_call
+   //efl_event_callback_legacy_call
    //  (lreq->obj, ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN, (void *)lreq->model);
 
    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)
    if (!it_data->is_dir)
      {
         // EVENTS: should not call legacy
-        //efl_event_callback_call
+        //efl_event_callback_legacy_call
         //  (data, ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)it_data->model);
         evas_object_smart_callback_call(data, "activated", (void *)it_data->path);
         return;
@@ -1138,7 +1138,7 @@ _on_item_selected(void *data, const Eo_Event *event)
           elm_object_text_set(sd->name_entry, it_data->filename);
 
         // EVENTS: should not call legacy
-        //efl_event_callback_call
+        //efl_event_callback_legacy_call
         //  (data, EFL_UI_EVENT_SELECTED, (void *)it_data->model);
         evas_object_smart_callback_call(data, "selected", (void *)it_data->path);
      }
@@ -1282,7 +1282,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
    if (!sd->model || !sd->path)
      {
         // EVENTS: should not call legacy
-        //efl_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
+        //efl_event_callback_legacy_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
         evas_object_smart_callback_call(fs, "done", NULL);
         return;
      }
@@ -1301,7 +1301,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
         _model_str_property_set(selected_model, "path", selection, NULL);
 
         // EVENTS: should not call legacy
-        //efl_event_callback_call
+        //efl_event_callback_legacy_call
         //  (fs, ELM_FILESELECTOR_EVENT_DONE, selected_model);
         evas_object_smart_callback_call(fs, "done", (void *) selection);
 
@@ -1314,12 +1314,12 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
         if (it_data)
           {
              // EVENTS: should not call legacy
-             //efl_event_callback_call
+             //efl_event_callback_legacy_call
              //  (fs, ELM_FILESELECTOR_EVENT_DONE, it_data->model);
              evas_object_smart_callback_call(fs, "done", (void *) it_data->path);
           }
         // EVENTS: should not call legacy
-        //efl_event_callback_call
+        //efl_event_callback_legacy_call
         //  (fs, ELM_FILESELECTOR_EVENT_DONE, sd->model);
         evas_object_smart_callback_call(fs, "done", (void *) sd->path);
      }
@@ -1331,7 +1331,7 @@ _canc(void *data, const Eo_Event *event EINA_UNUSED)
    Evas_Object *fs = data;
 
    // EVENTS: should not call legacy
-   //efl_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
+   //efl_event_callback_legacy_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
    evas_object_smart_callback_call(fs, "done", NULL);
 }
 
@@ -1368,7 +1368,7 @@ _text_activated_is_dir_then(void *data, void *value)
         if (sd->only_folder)
           {
              // EVENTS: should not call legacy
-             //efl_event_callback_call
+             //efl_event_callback_legacy_call
              //  (fs, EFL_UI_EVENT_SELECTED, (void *)model);
              evas_object_smart_callback_call(fs, "selected", (void *) str);
           }
@@ -1387,7 +1387,7 @@ _text_activated_is_dir_then(void *data, void *value)
              if (sd->only_folder)
                {
                   // EVENTS: should not call legacy
-                  //efl_event_callback_call
+                  //efl_event_callback_legacy_call
                   //  (fs, EFL_UI_EVENT_SELECTED, (void *)model);
                   evas_object_smart_callback_call(fs, "selected", (void *) str);
                }
@@ -1426,12 +1426,12 @@ _on_text_activated_set_path_then_error(void *data, Eina_Error err EINA_UNUSED)
    Eina_Stringshare *str = efl_key_data_get(fs, _text_activated_path_key);
 
    // EVENTS: should not call legacy
-   //efl_event_callback_call
+   //efl_event_callback_legacy_call
    //  (fs, EFL_UI_EVENT_SELECTED, (void *)model);
    evas_object_smart_callback_call(fs, "selected", (void *)str);
 
    // EVENTS: should not call legacy
-   //efl_event_callback_call
+   //efl_event_callback_legacy_call
    //  (fs, ELM_FILESELECTOR_EVENT_SELECTED_INVALID, (void *)model);
    evas_object_smart_callback_call(fs, "selected,invalid", (void *)str);
 
index 9507ad3..f7a173b 100644 (file)
@@ -107,7 +107,7 @@ _selection_done(void *data, const Eo_Event *event)
    evas_object_del(del);
 
    // EVENTS: should not call legacy
-   //efl_event_callback_call
+   //efl_event_callback_legacy_call
    //  (sd->obj, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN, (void *)model);
 }
 
index 8af305e..bb18979 100644 (file)
@@ -49,7 +49,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
   static void                                                               \
   _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED)                                          \
   {                                                                         \
-     efl_event_callback_call(data, event, ev->info);          \
+     efl_event_callback_legacy_call(data, event, ev->info);          \
   }
 SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED)
 SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
@@ -94,7 +94,7 @@ _FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
    eina_promise_then(promise, _file_chosen_path_then, NULL, data);
 
    // EVENTS: should not call legacy
-   //efl_event_callback_call
+   //efl_event_callback_legacy_call
    //  (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->info);
 }
 
@@ -132,7 +132,7 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
          elm_interface_fileselector_model_set(sd->button, model);
      }
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->info);
 }
 
index fc9ed81..d9495cc 100644 (file)
@@ -161,7 +161,7 @@ _on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
    ELM_HOVERSEL_DATA_GET(obj2, sd);
 
    if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it);
-   efl_event_callback_call(obj2, EFL_UI_EVENT_SELECTED, eo_it);
+   efl_event_callback_legacy_call(obj2, EFL_UI_EVENT_SELECTED, eo_it);
 
    evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item);
 
@@ -173,7 +173,7 @@ _item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Hoversel_Item_Data *it = data;
 
-   efl_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it));
 }
 
 static void
@@ -181,7 +181,7 @@ _item_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Hoversel_Item_Data *it = data;
 
-   efl_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
 }
 
 static void
@@ -349,7 +349,7 @@ _hover_del(Evas_Object *obj)
    sd->scr = NULL;
    sd->last_location = NULL;
 
-   efl_event_callback_call(obj, ELM_HOVERSEL_EVENT_DISMISSED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_HOVERSEL_EVENT_DISMISSED, NULL);
 }
 
 static void
@@ -429,7 +429,7 @@ _activate(Evas_Object *obj)
    _resizing_eval(obj, sd);
    elm_object_part_content_set(sd->hover, sd->last_location, sd->tbl);
 
-   efl_event_callback_call(obj, ELM_HOVERSEL_EVENT_EXPANDED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_HOVERSEL_EVENT_EXPANDED, NULL);
    evas_object_show(sd->hover);
 }
 
index dd1a9e4..a1d9e8b 100644 (file)
@@ -264,7 +264,7 @@ _shrink_mode_set(Evas_Object *obj,
                   evas_object_show(sd->end);
 
                   sd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK;
-                  efl_event_callback_call
+                  efl_event_callback_legacy_call
                     (obj, ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)1);
                   break;
                }
@@ -297,7 +297,7 @@ _shrink_mode_set(Evas_Object *obj,
           }
 
         sd->view_state = MULTIBUTTONENTRY_VIEW_NONE;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)(uintptr_t)sd->shrink);
      }
 
@@ -353,7 +353,7 @@ _elm_multibuttonentry_elm_widget_on_focus(Eo *obj, Elm_Multibuttonentry_Data *sd
                   elm_entry_input_panel_show(sd->entry);
                }
           }
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
      }
    else
@@ -363,7 +363,7 @@ _elm_multibuttonentry_elm_widget_on_focus(Eo *obj, Elm_Multibuttonentry_Data *sd
              _view_update(sd);
              elm_entry_input_panel_hide(sd->entry);
           }
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
      }
 
@@ -380,7 +380,7 @@ _item_del(Elm_Multibuttonentry_Item_Data *item)
 
    elm_box_unpack(sd->box, VIEW(item));
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_DELETED, EO_OBJ(item));
 
    if (sd->selected_it == item)
@@ -409,7 +409,7 @@ _current_item_state_change(Evas_Object *obj,
      {
       case MULTIBUTTONENTRY_BUTTON_STATE_SELECTED:
         elm_layout_signal_emit(VIEW(item), "elm,state,focused", "elm");
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_SELECTED, EO_OBJ(item));
         break;
       case MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT:
@@ -508,7 +508,7 @@ _on_item_clicked(void *data,
    _item_select(WIDGET(it), it);
 
    if (sd->selected_it)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_CLICKED, eo_it);
 }
 
@@ -557,7 +557,7 @@ _long_press_cb(void *data)
 
    sd->longpress_timer = NULL;
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, EO_OBJ(it));
 
    return ECORE_CALLBACK_CANCEL;
@@ -917,7 +917,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
         break;
      }
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED, eo_item);
 
    if (_elm_config->atspi_mode)
@@ -965,7 +965,7 @@ _mouse_clicked_signal_cb(void *data EINA_UNUSED,
                          const char *emission EINA_UNUSED,
                          const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static void
@@ -985,10 +985,10 @@ _box_resize_cb(void *data,
    elm_box_padding_get(obj, &hpad, NULL);
 
    if (sd->h_box < h)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (sd->parent, ELM_MULTIBUTTONENTRY_EVENT_EXPANDED, NULL);
    else if (sd->h_box > h)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (sd->parent, ELM_MULTIBUTTONENTRY_EVENT_CONTRACTED, NULL);
 
    if (sd->items && sd->w_box != w)
@@ -2033,7 +2033,7 @@ static Eina_Bool
 _key_action_longpress(Eo *obj, const char *params EINA_UNUSED)
 {
    ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(obj, it);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, obj);
    return EINA_TRUE;
 }
index a4a54b1..5e85567 100644 (file)
@@ -344,7 +344,7 @@ _on_item_title_transition_finished(void *data,
 {
    Elm_Naviframe_Item_Data *it = data;
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
          (WIDGET(it), ELM_NAVIFRAME_EVENT_TITLE_TRANSITION_FINISHED, EO_OBJ(it));
 }
 
@@ -1089,7 +1089,7 @@ _on_item_title_clicked(void *data,
 {
    Elm_Naviframe_Item_Data *it = data;
 
-   efl_event_callback_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TITLE_CLICKED, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TITLE_CLICKED, EO_OBJ(it));
 }
 
 /* "elm,state,cur,pushed"
@@ -1155,7 +1155,7 @@ _on_item_show_finished(void *data,
 
    it->pushing = EINA_FALSE;
 
-   efl_event_callback_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TRANSITION_FINISHED, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TRANSITION_FINISHED, EO_OBJ(it));
 }
 
 static void
@@ -1491,7 +1491,7 @@ _key_action_top_item_get(Evas_Object *obj, const char *params EINA_UNUSED)
    ///Leave for compatibility.
    ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it);
    if (it->title_prev_btn)
-     efl_event_callback_call(it->title_prev_btn, EFL_UI_EVENT_CLICKED, NULL);
+     efl_event_callback_legacy_call(it->title_prev_btn, EFL_UI_EVENT_CLICKED, NULL);
 
    return EINA_TRUE;
 }
index cd63436..0714ac4 100644 (file)
@@ -315,21 +315,21 @@ _forward(void *data, const Eo_Event *event EINA_UNUSED)
    elm_video_play_position_set(sd->video, pos);
 
    elm_layout_signal_emit(data, "elm,button,forward", "elm");
-   efl_event_callback_call(data, ELM_PLAYER_EVENT_FORWARD_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_FORWARD_CLICKED, NULL);
 }
 
 static void
 _info(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,info", "elm");
-   efl_event_callback_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL);
 }
 
 static void
 _next(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,next", "elm");
-   efl_event_callback_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL);
 }
 
 static void
@@ -339,7 +339,7 @@ _pause(void *data, const Eo_Event *event EINA_UNUSED)
 
    elm_layout_signal_emit(data, "elm,player,pause", "elm");
    elm_video_pause(sd->video);
-   efl_event_callback_call(data, ELM_PLAYER_EVENT_PAUSE_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_PAUSE_CLICKED, NULL);
 }
 
 static void
@@ -349,13 +349,13 @@ _play(void *data, const Eo_Event *event EINA_UNUSED)
 
    elm_layout_signal_emit(data, "elm,player,play", "elm");
    elm_video_play(sd->video);
-   efl_event_callback_call(data, ELM_PLAYER_EVENT_PLAY_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_PLAY_CLICKED, NULL);
 }
 
 static void
 _prev(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   efl_event_callback_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL);
    elm_layout_signal_emit(data, "elm,button,prev", "elm");
 }
 
@@ -371,14 +371,14 @@ _rewind(void *data, const Eo_Event *event EINA_UNUSED)
    elm_video_play_position_set(sd->video, pos);
 
    elm_layout_signal_emit(data, "elm,button,rewind", "elm");
-   efl_event_callback_call(data, ELM_PLAYER_EVENT_REWIND_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_REWIND_CLICKED, NULL);
 }
 
 static void
 _stop(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,stop", "elm");
-   efl_event_callback_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL);
 }
 
 static void
@@ -388,7 +388,7 @@ _eject(void *data, const Eo_Event *event EINA_UNUSED)
 
    elm_layout_signal_emit(data, "elm,button,eject", "elm");
    emotion_object_eject(elm_video_emotion_get(sd->video));
-   efl_event_callback_call(data, ELM_PLAYER_EVENT_EJECT_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_EJECT_CLICKED, NULL);
 }
 
 static void
@@ -413,7 +413,7 @@ _volume(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,volume", "elm");
    _mute_toggle(data);
-   efl_event_callback_call(data, ELM_PLAYER_EVENT_VOLUME_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_VOLUME_CLICKED, NULL);
 }
 
 static void
@@ -421,7 +421,7 @@ _mute(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,mute", "elm");
    _mute_toggle(data);
-   efl_event_callback_call(data, ELM_PLAYER_EVENT_MUTE_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_PLAYER_EVENT_MUTE_CLICKED, NULL);
 }
 
 static void
index 9fc6839..b2a1029 100644 (file)
@@ -104,20 +104,20 @@ _visuals_set(Evas_Object *obj)
 static void
 _block_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   efl_event_callback_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
 }
 
 static void
 _timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    evas_object_hide(data);
-   efl_event_callback_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL);
+   efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL);
 }
 
 static void
 _hide_effect_finished_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   efl_event_callback_call(data, ELM_POPUP_EVENT_DISMISSED, NULL);
+   efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_DISMISSED, NULL);
 }
 
 
@@ -883,7 +883,7 @@ _item_focused_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Popup_Item_Data *it = data;
 
-   efl_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_FOCUSED, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_FOCUSED, EO_OBJ(it));
 }
 
 static void
@@ -891,7 +891,7 @@ _item_unfocused_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Popup_Item_Data *it = data;
 
-   efl_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
 }
 
 EOLIAN static Eo *
@@ -1855,7 +1855,7 @@ _elm_popup_class_constructor(Efl_Class *klass)
 static Eina_Bool
 _action_dismiss(Evas_Object *obj, const char *params EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
    return EINA_TRUE;
 }
 
index b4d90cb..c4e5ee6 100644 (file)
@@ -155,13 +155,13 @@ _drag_button_move_cb(void *data,
    edje_object_part_drag_value_get
      (wd->resize_obj, "elm.drag_button_base", &pos, NULL);
    if (pos == 0.0)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !elm_widget_mirrored_get(obj) ? "left" : "right");
    else if (pos == 1.0)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !elm_widget_mirrored_get(obj) ? "right" : "left");
    else if (pos >= 0.45 && pos <= 0.55)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
 }
 
@@ -232,15 +232,15 @@ _button_animator(void *data)
 
         if ((!sd->final_position) &&
             (sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
-          efl_event_callback_call
+          efl_event_callback_legacy_call
             (obj, EFL_UI_EVENT_SELECTED, (char *)left);
         else if ((sd->final_position == 0.5) &&
                  (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
-          efl_event_callback_call
+          efl_event_callback_legacy_call
             (obj, EFL_UI_EVENT_SELECTED, (char *)center);
         else if ((sd->final_position == 1) &&
                  (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
-          efl_event_callback_call
+          efl_event_callback_legacy_call
             (obj, EFL_UI_EVENT_SELECTED, (char *)right);
 
         sd->button_animator = NULL;
@@ -278,7 +278,7 @@ _drag_button_up_cb(void *data,
         (elm_widget_mirrored_get(obj) && position == 1.0)))
      {
         sd->final_position = 0;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, EFL_UI_EVENT_SELECTED, (char *)left);
 
         return;
@@ -288,7 +288,7 @@ _drag_button_up_cb(void *data,
        (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
      {
         sd->final_position = 0.5;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, EFL_UI_EVENT_SELECTED, (char *)center);
 
         ecore_animator_del(sd->button_animator);
@@ -302,7 +302,7 @@ _drag_button_up_cb(void *data,
         (elm_widget_mirrored_get(obj) && position == 0.0)))
      {
         sd->final_position = 1;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, EFL_UI_EVENT_SELECTED, (char *)right);
         return;
      }
@@ -372,13 +372,13 @@ _track_move_cb(void *data,
           {
              if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
                {
-                  efl_event_callback_call
+                  efl_event_callback_legacy_call
                     (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
                   sd->final_position = 0.5;
                }
              else if (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)
                {
-                  efl_event_callback_call
+                  efl_event_callback_legacy_call
                     (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right");
                   sd->final_position = 1.0;
                }
@@ -386,7 +386,7 @@ _track_move_cb(void *data,
         else if ((sd->final_position == 0.5) &&
                  (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
           {
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right");
              sd->final_position = 1.0;
           }
@@ -395,7 +395,7 @@ _track_move_cb(void *data,
      {
         if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
           {
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
              sd->final_position = 0.5;
           }
@@ -406,13 +406,13 @@ _track_move_cb(void *data,
           {
              if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
                {
-                  efl_event_callback_call
+                  efl_event_callback_legacy_call
                     (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
                   sd->final_position = 0.5;
                }
              else if (sd->enabled_position & ELM_ACTIONSLIDER_LEFT)
                {
-                  efl_event_callback_call
+                  efl_event_callback_legacy_call
                     (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "left");
                   sd->final_position = 0.0;
                }
@@ -420,7 +420,7 @@ _track_move_cb(void *data,
         else if (sd->final_position == 0.5 &&
                 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
           {
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "left");
              sd->final_position = 0.0;
           }
index 4867d67..03eb85d 100644 (file)
@@ -42,7 +42,7 @@ _sub_path_process(Elm_App_Client *eo, Eldbus_Message_Iter *obj_iter, Elm_App_Cli
         view = efl_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(efl_self, obj_path));
         eina_hash_add(data->views, obj_path, view);
         if (!loading_list)
-          efl_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
+          efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
      }
 }
 
@@ -61,7 +61,7 @@ _objects_get(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA
    while (eldbus_message_iter_get_and_next(array_path, '{', &path))
      _sub_path_process(eo, path, cdata, EINA_TRUE);
 
-   efl_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, NULL);
+   efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, NULL);
 }
 
 static void _iface_add(void *data, const Eldbus_Message *msg)
@@ -105,7 +105,7 @@ _iface_del(void *data, const Eldbus_Message *msg)
           }
 
         eina_hash_del(cdata->views, path, NULL);
-        efl_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view);
+        efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view);
         efl_del(view);
      }
 }
@@ -146,7 +146,7 @@ _pkg_name_owner_changed_cb(void *data, const char *bus EINA_UNUSED, const char *
           }
 
         eina_hash_del(cdata->views, path, NULL);
-        efl_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view);
+        efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view);
         efl_del(view);
      }
 }
@@ -215,7 +215,7 @@ _create_view_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
      {
         view = efl_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(efl_self, view_path));
         eina_hash_add(cdata->views, view_path, view);
-        efl_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
+        efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
      }
 
    if (!view)
index 2328a8f..a662edb 100644 (file)
@@ -58,26 +58,26 @@ _prop_changed(void *user_data, Eldbus_Proxy *proxy EINA_UNUSED, void *event_info
    Elm_App_Client_View_Data *cdata = efl_data_scope_get(eo, MY_CLASS);
 
    if (!strcmp(prop_event->name, "Title"))
-     efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_TITLE_CHANGED, (void *) _string_prop_get(v));
+     efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_VIEW_EVENT_TITLE_CHANGED, (void *) _string_prop_get(v));
    else if (!strcmp(prop_event->name, "IconName"))
-     efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_ICON_CHANGED, (void *) _string_prop_get(v));
+     efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_VIEW_EVENT_ICON_CHANGED, (void *) _string_prop_get(v));
    else if (!strcmp(prop_event->name, "IconPixels"))
-     efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_ICON_PIXELS_CHANGED, NULL);
+     efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_VIEW_EVENT_ICON_PIXELS_CHANGED, NULL);
    else if (!strcmp(prop_event->name, "NewEvents"))
-     efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_NEW_EVENTS_CHANGED, (void *)(uintptr_t)_int_prop_get(v));
+     efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_VIEW_EVENT_NEW_EVENTS_CHANGED, (void *)(uintptr_t)_int_prop_get(v));
    else if (!strcmp(prop_event->name, "Progress"))
-     efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_PROGRESS_CHANGED, (void *)(uintptr_t)_short_prop_get(v));
+     efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_VIEW_EVENT_PROGRESS_CHANGED, (void *)(uintptr_t)_short_prop_get(v));
    else if (!strcmp(prop_event->name, "State"))
      {
         cdata->state = _string_state_to_id(_string_prop_get(v));
-        efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, (void *)(uintptr_t)cdata->state);
+        efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, (void *)(uintptr_t)cdata->state);
      }
    else if (!strcmp(prop_event->name, "WindowId"))
-     efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_WINDOW_CHANGED, (void *)(uintptr_t)_int_prop_get(v));
+     efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_VIEW_EVENT_WINDOW_CHANGED, (void *)(uintptr_t)_int_prop_get(v));
    else
       return;
 
-   efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, (void *) prop_event->name);
+   efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, (void *) prop_event->name);
 }
 
 static void
@@ -115,7 +115,7 @@ elm_app_client_view_internal_state_set(Eo *eo, Elm_App_View_State state)
    cdata->state = state;
    if (!changed)
      return;
-   efl_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, (void *)(uintptr_t)cdata->state);
+   efl_event_callback_legacy_call(eo, ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, (void *)(uintptr_t)cdata->state);
 }
 
 EOLIAN static Eo *
index b5bc2af..3a795df 100644 (file)
@@ -130,7 +130,7 @@ _method_terminate(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbu
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
 
-   efl_event_callback_call(eo, ELM_APP_SERVER_EVENT_TERMINATE, NULL);
+   efl_event_callback_legacy_call(eo, ELM_APP_SERVER_EVENT_TERMINATE, NULL);
 
    return eldbus_message_method_return_new(message);
 }
@@ -304,7 +304,7 @@ _elm_app_server_save(Eo *obj EINA_UNUSED, Elm_App_Server_Data *data)
         icon_name = elm_app_server_view_icon_get(view);
         new_events = elm_app_server_view_new_events_get(view);
         progress = elm_app_server_view_progress_get(view);
-        efl_event_callback_call(view, ELM_APP_SERVER_VIEW_EVENT_SAVE, NULL);
+        efl_event_callback_legacy_call(view, ELM_APP_SERVER_VIEW_EVENT_SAVE, NULL);
 
         view_props = elm_app_server_view_props_new(id, title, icon_name,
                                                    new_events, progress);
index fcd4708..4a092b4 100644 (file)
@@ -43,7 +43,7 @@ _method_close(const Eldbus_Service_Interface *iface, const Eldbus_Message *messa
    Elm_App_Server_View_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    _state_set(data, ELM_APP_VIEW_STATE_CLOSED);
-   efl_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL);
+   efl_event_callback_legacy_call(eo, ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL);
 
    return eldbus_message_method_return_new(message);
 }
@@ -55,7 +55,7 @@ _method_pause(const Eldbus_Service_Interface *iface, const Eldbus_Message *messa
    Elm_App_Server_View_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    _state_set(data, ELM_APP_VIEW_STATE_PAUSED);
-   efl_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL);
+   efl_event_callback_legacy_call(eo, ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL);
 
    return eldbus_message_method_return_new(message);
 }
@@ -67,7 +67,7 @@ _method_resume(const Eldbus_Service_Interface *iface, const Eldbus_Message *mess
    Elm_App_Server_View_Data *data = efl_data_scope_get(eo, MY_CLASS);
 
    _state_set(data, ELM_APP_VIEW_STATE_LIVE);
-   efl_event_callback_call(eo, ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL);
+   efl_event_callback_legacy_call(eo, ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL);
 
    return eldbus_message_method_return_new(message);
 }
@@ -170,28 +170,28 @@ EOLIAN static void
 _elm_app_server_view_resume(Eo *obj, Elm_App_Server_View_Data *data)
 {
    _state_set(data, ELM_APP_VIEW_STATE_LIVE);
-   efl_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_APP_SERVER_VIEW_EVENT_RESUMED, NULL);
 }
 
 EOLIAN static void
 _elm_app_server_view_pause(Eo *obj, Elm_App_Server_View_Data *data)
 {
    _state_set(data, ELM_APP_VIEW_STATE_PAUSED);
-   efl_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_APP_SERVER_VIEW_EVENT_PAUSED, NULL);
 }
 
 EOLIAN static void
 _elm_app_server_view_close(Eo *obj, Elm_App_Server_View_Data *data)
 {
    _state_set(data, ELM_APP_VIEW_STATE_CLOSED);
-   efl_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_APP_SERVER_VIEW_EVENT_CLOSED, NULL);
 }
 
 EOLIAN static void
 _elm_app_server_view_shallow(Eo *obj, Elm_App_Server_View_Data *data)
 {
    _state_set(data, ELM_APP_VIEW_STATE_SHALLOW);
-   efl_event_callback_call(obj, ELM_APP_SERVER_VIEW_EVENT_SHALLOW, NULL);
+   efl_event_callback_legacy_call(obj, ELM_APP_SERVER_VIEW_EVENT_SHALLOW, NULL);
 }
 
 EOLIAN static Elm_App_View_State
index 5056cf4..8b87a76 100644 (file)
@@ -3792,7 +3792,7 @@ _registered_listeners_get(void *data, const Eldbus_Message *msg, Eldbus_Pending
      }
 
    if (!pd->connected)
-      efl_event_callback_call(data, ELM_ATSPI_BRIDGE_EVENT_CONNECTED, NULL);
+      efl_event_callback_legacy_call(data, ELM_ATSPI_BRIDGE_EVENT_CONNECTED, NULL);
    pd->connected = EINA_TRUE;
 }
 
@@ -4295,7 +4295,7 @@ _a11y_connection_shutdown(Eo *bridge)
    elm_interface_atspi_accessible_event_handler_del(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, pd->event_hdlr);
    pd->event_hdlr = NULL;
 
-   efl_event_callback_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
+   efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
    pd->connected = EINA_FALSE;
 }
 
index 607794f..700078e 100644 (file)
@@ -34,7 +34,7 @@ _child_added_cb_proxy(void *data, const Eo_Event *event)
 {
    Evas_Object *box = data;
    Evas_Object_Box_Option *opt = event->info;
-   efl_event_callback_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj);
+   efl_event_callback_legacy_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj);
 }
 
 static void
@@ -42,7 +42,7 @@ _child_removed_cb_proxy(void *data, const Eo_Event *event)
 {
    Evas_Object *box = data;
    Evas_Object *child = event->info;
-   efl_event_callback_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child);
+   efl_event_callback_legacy_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child);
 }
 
 EOLIAN static Eina_Bool
index 9904f9d..9f92fc6 100644 (file)
@@ -71,7 +71,7 @@ _on_mouse_up(void *data,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
      return;
 
-   efl_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 /* overriding layout's focus_next() in order to just cycle through the
index 25c70da..17ef209 100644 (file)
@@ -69,7 +69,7 @@ _activate(Evas_Object *obj)
           _elm_access_say(E_("Clicked"));
         if (!elm_widget_disabled_get(obj) &&
             !evas_object_freeze_events_get(obj))
-          efl_event_callback_call
+          efl_event_callback_legacy_call
             (obj, EFL_UI_EVENT_CLICKED, NULL);
      }
 }
@@ -93,7 +93,7 @@ _elm_button_elm_widget_activate(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Elm_A
    if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE;
    if (evas_object_freeze_events_get(obj)) return EINA_FALSE;
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_CLICKED, NULL);
    elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
 
@@ -201,7 +201,7 @@ _autorepeat_send(void *data)
 {
    ELM_BUTTON_DATA_GET_OR_RETURN_VAL(data, sd, ECORE_CALLBACK_CANCEL);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_REPEATED, NULL);
    if (!sd->repeating)
      {
@@ -242,7 +242,7 @@ _on_pressed_signal(void *data,
               (sd->ar_initial_timeout, _autorepeat_initial_send, data);
      }
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_PRESSED, NULL);
 }
 
@@ -256,7 +256,7 @@ _on_unpressed_signal(void *data,
 
    ELM_SAFE_FREE(sd->timer, ecore_timer_del);
    sd->repeating = EINA_FALSE;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_UNPRESSED, NULL);
 }
 
index 53c8a4e..dc41e9d 100644 (file)
@@ -935,9 +935,9 @@ _update_data(Evas_Object *obj, Eina_Bool month,
           sd->selected_time.tm_mday = maxdays;
 
         _fix_selected_time(sd);
-        efl_event_callback_call(obj, ELM_CALENDAR_EVENT_CHANGED, NULL);
+        efl_event_callback_legacy_call(obj, ELM_CALENDAR_EVENT_CHANGED, NULL);
      }
-   efl_event_callback_call(obj, ELM_CALENDAR_EVENT_DISPLAY_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_CALENDAR_EVENT_DISPLAY_CHANGED, NULL);
 
    return EINA_TRUE;
 }
@@ -1221,7 +1221,7 @@ _update_sel_it(Evas_Object *obj,
    sd->selected_time.tm_mday = day;
    _fix_selected_time(sd);
    _select(obj, sel_it);
-   efl_event_callback_call(obj, ELM_CALENDAR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_CALENDAR_EVENT_CHANGED, NULL);
 }
 
 static void
index 648b0ec..0f56516 100644 (file)
@@ -75,7 +75,7 @@ _activate(Evas_Object *obj)
              _elm_access_say(E_("State: Off"));
      }
 
-   efl_event_callback_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
        elm_interface_atspi_accessible_state_changed_signal_emit(obj,
@@ -251,7 +251,7 @@ _on_check_off(void *data,
    if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj);
 
    elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
-   efl_event_callback_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
        elm_interface_atspi_accessible_state_changed_signal_emit(data,
@@ -272,7 +272,7 @@ _on_check_on(void *data,
    efl_ui_nstate_value_set(obj, 1);
    if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj);
    elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
-   efl_event_callback_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(data,
index ba71416..9e815e4 100644 (file)
@@ -73,7 +73,7 @@ _on_clock_val_up(void *data)
    sd->interval = sd->interval / 1.05;
    ecore_timer_interval_set(sd->spin, sd->interval);
    _time_update(data, EINA_FALSE);
-   efl_event_callback_call(data, ELM_CLOCK_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(data, ELM_CLOCK_EVENT_CHANGED, NULL);
    return ECORE_CALLBACK_RENEW;
 
 clock_val_up_cancel:
@@ -128,7 +128,7 @@ _on_clock_val_down(void *data)
    sd->interval = sd->interval / 1.05;
    ecore_timer_interval_set(sd->spin, sd->interval);
    _time_update(data, EINA_FALSE);
-   efl_event_callback_call(data, ELM_CLOCK_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(data, ELM_CLOCK_EVENT_CHANGED, NULL);
    return ECORE_CALLBACK_RENEW;
 
 clock_val_down_cancel:
index ef1b6ec..5062031 100644 (file)
@@ -109,7 +109,7 @@ elm_code_callback_fire(Elm_Code *code, const Efl_Event_Description *signal, void
 
    EINA_LIST_FOREACH(code->widgets, item, widget)
      {
-        efl_event_callback_call(widget, signal, data);
+        efl_event_callback_legacy_call(widget, signal, data);
      }
 }
 
index 823a198..99cf141 100644 (file)
@@ -595,7 +595,7 @@ _elm_code_widget_cursor_move(Elm_Code_Widget *widget, Elm_Code_Widget_Data *pd,
    if (!was_key)
      _elm_code_widget_update_focus_directions(widget);
 
-   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CURSOR_CHANGED, widget);
+   efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CURSOR_CHANGED, widget);
    _elm_code_widget_cursor_ensure_visible(widget);
 
    if (oldrow != pd->cursor_line)
@@ -666,7 +666,7 @@ _elm_code_widget_clicked_gutter_cb(Elm_Code_Widget *widget, unsigned int row)
    if (!line)
      return;
 
-   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_GUTTER_CLICKED, line);
+   efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_GUTTER_CLICKED, line);
 }
 
 static void
@@ -702,7 +702,7 @@ _elm_code_widget_clicked_readonly_cb(Elm_Code_Widget *widget, unsigned int row)
    if (!line)
      return;
 
-   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, line);
+   efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_LINE_CLICKED, line);
 }
 
 static void
@@ -1064,7 +1064,7 @@ _elm_code_widget_text_at_cursor_insert_do(Elm_Code_Widget *widget, const char *t
    // a workaround for when the cursor position would be off the line width
    _elm_code_widget_resize(widget, line);
    elm_obj_code_widget_cursor_position_set(widget, col + col_width, row);
-   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 
    if (undo)
      {
@@ -1143,7 +1143,7 @@ _elm_code_widget_newline(Elm_Code_Widget *widget)
 
    indent = elm_obj_code_widget_line_text_column_width_to_position(widget, line, leading);
    elm_obj_code_widget_cursor_position_set(widget, indent, row + 1);
-   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 
    change = _elm_code_widget_change_create(width + 1, row, indent - 1, row + 1, "\n", 1, EINA_TRUE);
    _elm_code_widget_undo_change_add(widget, change);
@@ -1176,7 +1176,7 @@ _elm_code_widget_backspaceline(Elm_Code_Widget *widget, Eina_Bool nextline)
         elm_obj_code_widget_cursor_position_set(widget, position, row - 1);
      }
 // TODO construct and pass a change object
-   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 }
 
 void
@@ -1215,7 +1215,7 @@ _elm_code_widget_backspace(Elm_Code_Widget *widget)
    elm_code_line_text_remove(line, position - char_width, char_width);
    elm_obj_code_widget_cursor_position_set(widget, start_col, row);
 
-   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 
    change = _elm_code_widget_change_create(start_col, row, end_col, row, text, char_width, EINA_FALSE);
    _elm_code_widget_undo_change_add(widget, change);
@@ -1256,7 +1256,7 @@ _elm_code_widget_delete(Elm_Code_Widget *widget)
    text = elm_code_widget_text_between_positions_get(widget, start_col, row, end_col, row);
    elm_code_line_text_remove(line, position, char_width);
    elm_obj_code_widget_cursor_position_set(widget, start_col, row);
-   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 
    change = _elm_code_widget_change_create(start_col, row, col, row, text, char_width, EINA_FALSE);
    _elm_code_widget_undo_change_add(widget, change);
@@ -1283,7 +1283,7 @@ _elm_code_widget_control_key_down_cb(Elm_Code_Widget *widget, const char *key)
      elm_code_widget_undo(widget);
 
    // TODO construct and pass a change object for cut and paste
-         efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
+         efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 }
 
 static void
index e6076ac..7e16a2f 100644 (file)
@@ -62,7 +62,7 @@ elm_code_widget_selection_start(Evas_Object *widget,
 
    pd->selection->start_line = line;
    pd->selection->start_col = col;
-   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
+   efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
    elm_obj_code_widget_cursor_position_set(widget, col, line);
 }
 
@@ -88,7 +88,7 @@ elm_code_widget_selection_end(Evas_Object *widget,
 
    pd->selection->end_line = line;
    pd->selection->end_col = col;
-   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
+   efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CHANGED, widget);
 }
 
 EAPI Elm_Code_Widget_Selection_Data *
@@ -144,7 +144,7 @@ elm_code_widget_selection_clear(Evas_Object *widget)
 
    free(pd->selection);
    pd->selection = NULL;
-   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
+   efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
 }
 
 static void
@@ -246,7 +246,7 @@ elm_code_widget_selection_delete(Evas_Object *widget)
 
    free(pd->selection);
    pd->selection = NULL;
-   efl_event_callback_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
+   efl_event_callback_legacy_call(widget, ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CLEARED, widget);
 }
 
 EAPI void
index 3ba996a..a2b67cd 100644 (file)
@@ -575,8 +575,8 @@ _update_hsla_from_colorbar(Evas_Object *obj, Color_Type type, double x)
    _update_colorbars(sd);
    if ((sd->mode == ELM_COLORSELECTOR_ALL) || (sd->mode == ELM_COLORSELECTOR_PICKER))
      _color_picker_init(sd);
-   efl_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL);
-   efl_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_legacy_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
 }
 
 static void
@@ -633,7 +633,7 @@ _colors_set(Evas_Object *obj,
    if ((sd->mode == ELM_COLORSELECTOR_ALL) || (sd->mode == ELM_COLORSELECTOR_PICKER))
      _color_picker_init(sd);
    if (!mode_change)
-     efl_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL);
+     efl_event_callback_legacy_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -678,7 +678,7 @@ _spinner_changed_cb(void *data, const Eo_Event *event)
          break;
      }
    evas_object_data_del(event->object, "_changed");
-   efl_event_callback_call(parent, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_legacy_call(parent, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
 }
 
 #ifdef HAVE_ELEMENTARY_X
@@ -766,7 +766,7 @@ _mouse_up_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
 
    _unselect_selected_item(sd);
    _colors_set(o, r, g, b, 0xFF, EINA_FALSE);
-   efl_event_callback_call(o, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
+   efl_event_callback_legacy_call(o, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
 
    return EINA_TRUE;
 }
@@ -1538,7 +1538,7 @@ _on_color_long_press(void *data)
 
    sd->longpress_timer = NULL;
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(item), ELM_COLORSELECTOR_EVENT_COLOR_ITEM_LONGPRESSED, EO_OBJ(item));
 
    return ECORE_CALLBACK_CANCEL;
@@ -1613,7 +1613,7 @@ _on_color_released(void *data,
    elm_object_signal_emit(VIEW(item), "elm,state,selected", "elm");
    elm_colorselector_color_set(WIDGET(item), item->color->r, item->color->g,
                                item->color->b, item->color->a);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(item), ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, EO_OBJ(item));
 
    eo_temp_item = eina_list_data_get(sd->selected);
@@ -2099,7 +2099,7 @@ _key_action_move(Evas_Object *obj, const char *params)
         elm_colorselector_color_set
           (WIDGET(item), item->color->r, item->color->g, item->color->b,
           item->color->a);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (WIDGET(item), ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, eo_item);
         elm_obj_color_item_selected_set(eo_item, EINA_TRUE);
      }
index 081b69e..c27e589 100644 (file)
@@ -760,7 +760,7 @@ _virtualkeypad_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
         _conformant_part_sizing_eval(obj, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART);
         if (!sd->clipboard_state)
           elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE);
-        efl_event_callback_call(obj, ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_OFF, NULL);
+        efl_event_callback_legacy_call(obj, ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_OFF, NULL);
      }
    else if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON)
      {
@@ -768,7 +768,7 @@ _virtualkeypad_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
         _conformant_part_sizing_eval(obj, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART);
         elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_COMPRESS);
         _autoscroll_objects_update(obj);
-        efl_event_callback_call(obj, ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_ON, NULL);
+        efl_event_callback_legacy_call(obj, ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_ON, NULL);
      }
 }
 
@@ -798,13 +798,13 @@ _clipboard_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
         evas_object_size_hint_max_set(sd->clipboard, -1, 0);
         if (!sd->vkb_state)
           elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE);
-        efl_event_callback_call(obj, ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_OFF, NULL);
+        efl_event_callback_legacy_call(obj, ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_OFF, NULL);
      }
    else if (state == ECORE_X_ILLUME_CLIPBOARD_STATE_ON)
      {
         elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_COMPRESS);
         _autoscroll_objects_update(obj);
-        efl_event_callback_call(obj, ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_ON, NULL);
+        efl_event_callback_legacy_call(obj, ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_ON, NULL);
      }
 }
 
index 9eb86f1..a880edd 100644 (file)
@@ -1025,7 +1025,7 @@ _elm_datetime_field_limit_set(Eo *obj, Elm_Datetime_Data *sd, Elm_Datetime_Field
    _apply_field_limits(obj);
 
    if (!_field_cmp(fieldtype, &old_time, &sd->curr_time))
-     efl_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
+     efl_event_callback_legacy_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
 
 }
 
@@ -1052,7 +1052,7 @@ _elm_datetime_value_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm *newtime
    _validate_datetime_limits(&sd->max_limit, &sd->curr_time, EINA_TRUE);
    _apply_field_limits(obj);
 
-   efl_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
 
    return EINA_TRUE;
 }
@@ -1084,7 +1084,7 @@ _elm_datetime_value_min_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm *min
    _apply_field_limits(obj);
 
    if (!_date_cmp(&old_time, &sd->curr_time))
-     efl_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
+     efl_event_callback_legacy_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
 
    return EINA_TRUE;
 }
@@ -1116,7 +1116,7 @@ _elm_datetime_value_max_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm *max
    _apply_field_limits(obj);
 
    if (!_date_cmp(&old_time, &sd->curr_time))
-     efl_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
+     efl_event_callback_legacy_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
 
    return EINA_TRUE;
 }
index 6444323..60e8583 100644 (file)
@@ -199,7 +199,7 @@ _item_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Dayselector_Item_Data *it = data;
 
-   efl_event_callback_call(WIDGET(it), EFL_UI_CHECK_EVENT_CHANGED, (void *)it->day);
+   efl_event_callback_legacy_call(WIDGET(it), EFL_UI_CHECK_EVENT_CHANGED, (void *)it->day);
 }
 
 static Elm_Dayselector_Item_Data *
index 371ddbe..23f1437 100644 (file)
@@ -89,7 +89,7 @@ _item_select(Elm_Diskselector_Item_Data *it)
    _selected_item_indicate(sd->selected_item);
 
    if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
 }
 
@@ -611,7 +611,7 @@ _item_click_cb(void *data,
      }
 
    if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(it), EFL_UI_EVENT_CLICKED, eo_it);
 }
 
@@ -1098,7 +1098,7 @@ _scroll_animate_stop_cb(Evas_Object *obj,
 
    if (!it) return;
    _item_select(it);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it));
 }
 
@@ -1106,7 +1106,7 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj));
 }
 
@@ -1114,7 +1114,7 @@ static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj));
 }
 
@@ -1122,7 +1122,7 @@ static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj));
 }
 
index 3e64cce..84a7999 100644 (file)
@@ -300,7 +300,7 @@ _validate(Evas_Object *obj)
    if (sd->validators == 0) return;
 
    vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text");
-   res = efl_event_callback_call(obj, ELM_ENTRY_EVENT_VALIDATE, (void *)&vc);
+   res = efl_event_callback_legacy_call(obj, ELM_ENTRY_EVENT_VALIDATE, (void *)&vc);
    buf = eina_strbuf_new();
    eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass");
    edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm");
@@ -964,7 +964,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
    evas_event_thaw(evas_object_evas_get(obj));
    evas_event_thaw_eval(evas_object_evas_get(obj));
 
-   efl_event_callback_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
 
    evas_object_unref(obj);
 
@@ -976,7 +976,7 @@ _cursor_geometry_recalc(Evas_Object *obj)
 {
    ELM_ENTRY_DATA_GET(obj, sd);
 
-   efl_event_callback_call(obj, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
 
    if (!sd->deferred_recalc_job)
      {
@@ -1239,7 +1239,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *ite
         if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand &&
             !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
-        efl_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
+        efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
         _return_key_enabled_check(obj);
@@ -1254,7 +1254,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *ite
         if (top && top_is_win && sd->input_panel_enable &&
             !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
           elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
-        efl_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
+        efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 
@@ -1513,7 +1513,7 @@ _paste_cb(void *data,
 
    ELM_ENTRY_DATA_GET(data, sd);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_SELECTION_PASTE, NULL);
 
    sd->selection_asked = EINA_TRUE;
@@ -1565,7 +1565,7 @@ _cut_cb(void *data,
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_SELECTION_CUT, NULL);
    /* Store it */
    sd->sel_mode = EINA_FALSE;
@@ -1588,7 +1588,7 @@ _copy_cb(void *data,
 {
    ELM_ENTRY_DATA_GET(data, sd);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_SELECTION_COPY, NULL);
    sd->sel_mode = EINA_FALSE;
    if (!_elm_config->desktop_entry)
@@ -1640,7 +1640,7 @@ _menu_call(Evas_Object *obj)
 
    if (sd->anchor_hover.hover) return;
 
-   efl_event_callback_call(obj, ELM_ENTRY_EVENT_CONTEXT_OPEN, NULL);
+   efl_event_callback_legacy_call(obj, ELM_ENTRY_EVENT_CONTEXT_OPEN, NULL);
 
    if ((sd->api) && (sd->api->obj_longpress))
      {
@@ -1923,7 +1923,7 @@ _long_press_cb(void *data)
    sd->long_pressed = EINA_TRUE;
 
    sd->longpress_timer = NULL;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_LONGPRESSED, NULL);
 
    return ECORE_CALLBACK_CANCEL;
@@ -2139,7 +2139,7 @@ _entry_changed_handle(void *data,
    /* callback - this could call callbacks that delete the
     * entry... thus... any access to sd after this could be
     * invalid */
-   efl_event_callback_call(data, event, NULL);
+   efl_event_callback_legacy_call(data, event, NULL);
 }
 
 static void
@@ -2164,11 +2164,11 @@ _entry_changed_user_signal_cb(void *data,
    if (edje_info)
      {
         memcpy(&info, edje_info, sizeof(info));
-        efl_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED_USER, &info);
+        efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CHANGED_USER, &info);
      }
    else
      {
-        efl_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED_USER, NULL);
+        efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CHANGED_USER, NULL);
      }
    if (_elm_config->atspi_mode)
      {
@@ -2225,7 +2225,7 @@ _entry_undo_request_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, ELM_ENTRY_EVENT_UNDO_REQUEST, NULL);
+   efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_UNDO_REQUEST, NULL);
 }
 
 static void
@@ -2234,7 +2234,7 @@ _entry_redo_request_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, ELM_ENTRY_EVENT_REDO_REQUEST, NULL);
+   efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_REDO_REQUEST, NULL);
 }
 
 static void
@@ -2250,7 +2250,7 @@ _entry_selection_start_signal_cb(void *data,
      {
         if (entry != data) elm_entry_select_none(entry);
      }
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_SELECTION_START, NULL);
 
    elm_object_focus_set(data, EINA_TRUE);
@@ -2283,7 +2283,7 @@ _entry_selection_changed_signal_cb(void *data,
    ELM_ENTRY_DATA_GET(data, sd);
 
    sd->have_selection = EINA_TRUE;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_SELECTION_CHANGED, NULL);
    _selection_store(ELM_SEL_TYPE_PRIMARY, data);
    _update_selection_handler(data);
@@ -2302,7 +2302,7 @@ _entry_selection_cleared_signal_cb(void *data,
    if (!sd->have_selection) return;
 
    sd->have_selection = EINA_FALSE;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
    if (sd->cut_sel)
      {
@@ -2334,7 +2334,7 @@ _entry_paste_request_signal_cb(void *data,
      ELM_SEL_TYPE_PRIMARY : ELM_SEL_TYPE_CLIPBOARD;
 
    if (!sd->editable) return;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_SELECTION_PASTE, NULL);
 
    top = elm_widget_top_get(data);
@@ -2394,7 +2394,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
                                        const char *emission EINA_UNUSED,
                                        const char *source EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
@@ -2453,7 +2453,7 @@ _entry_anchor_down_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     efl_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_DOWN, &ei);
+     efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_ANCHOR_DOWN, &ei);
 }
 
 static void
@@ -2476,7 +2476,7 @@ _entry_anchor_up_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     efl_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_UP, &ei);
+     efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_ANCHOR_UP, &ei);
 }
 
 static void
@@ -2556,7 +2556,7 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
         ei.hover_right = tmp;
      }
 
-   efl_event_callback_call(obj, ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei);
+   efl_event_callback_legacy_call(obj, ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei);
    efl_event_callback_add
      (sd->anchor_hover.hover, EFL_UI_EVENT_CLICKED, _anchor_hover_clicked_cb, obj);
 
@@ -2596,7 +2596,7 @@ _entry_anchor_clicked_signal_cb(void *data,
 
    if (!sd->disabled)
      {
-        efl_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_CLICKED, &ei);
+        efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_ANCHOR_CLICKED, &ei);
         _entry_hover_anchor_clicked_do(data, &ei);
      }
 }
@@ -2626,7 +2626,7 @@ _entry_anchor_in_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     efl_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_IN, &ei);
+     efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_ANCHOR_IN, &ei);
 }
 
 static void
@@ -2646,7 +2646,7 @@ _entry_anchor_out_signal_cb(void *data,
    _signal_anchor_geoms_do_things_with_lol(sd, &ei);
 
    if (!sd->disabled)
-     efl_event_callback_call(data, ELM_ENTRY_EVENT_ANCHOR_OUT, &ei);
+     efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_ANCHOR_OUT, &ei);
 }
 
 static void
@@ -2655,7 +2655,7 @@ _entry_key_enter_signal_cb(void *data,
                            const char *emission EINA_UNUSED,
                            const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, ELM_ENTRY_EVENT_ACTIVATED, NULL);
+   efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_ACTIVATED, NULL);
 }
 
 static void
@@ -2664,7 +2664,7 @@ _entry_key_escape_signal_cb(void *data,
                             const char *emission EINA_UNUSED,
                             const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, ELM_ENTRY_EVENT_ABORTED, NULL);
+   efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_ABORTED, NULL);
 }
 
 static void
@@ -2673,7 +2673,7 @@ _entry_mouse_down_signal_cb(void *data,
                             const char *emission EINA_UNUSED,
                             const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, ELM_ENTRY_EVENT_PRESS, NULL);
+   efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_PRESS, NULL);
 }
 
 static void
@@ -2682,7 +2682,7 @@ _entry_mouse_clicked_signal_cb(void *data,
                                const char *emission EINA_UNUSED,
                                const char *source EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
@@ -2692,7 +2692,7 @@ _entry_mouse_double_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
 }
 
@@ -2702,7 +2702,7 @@ _entry_mouse_triple_signal_cb(void *data,
                               const char *emission EINA_UNUSED,
                               const char *source EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_CLICKED_TRIPLE, NULL);
 }
 
@@ -2933,7 +2933,7 @@ _text_append_idler(void *data)
         free(sd->append_text_left);
         sd->append_text_left = NULL;
         sd->append_text_idler = NULL;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, ELM_ENTRY_EVENT_TEXT_SET_DONE, NULL);
         return ECORE_CALLBACK_CANCEL;
      }
@@ -2996,7 +2996,7 @@ _chars_add_till_limit(Evas_Object *obj,
           {
              if (!i)
                {
-                  efl_event_callback_call
+                  efl_event_callback_legacy_call
                     (obj, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
                   ELM_SAFE_FREE(*text, free);
                   return;
@@ -3015,7 +3015,7 @@ _chars_add_till_limit(Evas_Object *obj,
         i++;
      }
 
-   efl_event_callback_call(obj, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
 }
 
 EOLIAN static void
@@ -3169,7 +3169,7 @@ _entry_text_append(Evas_Object* obj, const char* entry, Eina_Bool set)
                }
              edje_object_part_text_cursor_pos_set(sd->entry_edje, "elm.text",
                    EDJE_CURSOR_MAIN, sd->cursor_pos);
-             efl_event_callback_call(obj, ELM_ENTRY_EVENT_TEXT_SET_DONE, NULL);
+             efl_event_callback_legacy_call(obj, ELM_ENTRY_EVENT_TEXT_SET_DONE, NULL);
           }
      }
 }
@@ -4259,7 +4259,7 @@ _elm_entry_select_none(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
         edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm");
      }
    if (sd->have_selection)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
 
    sd->have_selection = EINA_FALSE;
@@ -4662,7 +4662,7 @@ elm_entry_filter_limit_size(void *data,
         newlen = evas_string_char_len_get(utfstr);
         if ((len >= lim->max_char_count) && (newlen > 0))
           {
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                (entry, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
              ELM_SAFE_FREE(*text, free);
              free(current);
@@ -4679,7 +4679,7 @@ elm_entry_filter_limit_size(void *data,
         newlen = strlen(utfstr);
         if ((len >= lim->max_byte_count) && (newlen > 0))
           {
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                (entry, ELM_ENTRY_EVENT_MAXLENGTH_REACHED, NULL);
              ELM_SAFE_FREE(*text, free);
              free(current);
@@ -4814,7 +4814,7 @@ inserting:
      }
    *insert = 0;
    if (rejected)
-     efl_event_callback_call(entry, ELM_ENTRY_EVENT_REJECTED, NULL);
+     efl_event_callback_legacy_call(entry, ELM_ENTRY_EVENT_REJECTED, NULL);
 }
 
 EOLIAN static void
@@ -4947,7 +4947,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
 {
    ELM_ENTRY_DATA_GET(obj, sd);
    /* here we need to emit the signal that the elm_scroller would have done */
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL, NULL);
 
    if (sd->have_selection)
@@ -5363,7 +5363,7 @@ _elm_entry_elm_widget_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Elm_Act
    if (!elm_widget_disabled_get(obj) &&
        !evas_object_freeze_events_get(obj))
      {
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, EFL_UI_EVENT_CLICKED, NULL);
         if (sd->editable && sd->input_panel_enable)
           edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text");
index 7bf5f0d..fd7b6d6 100644 (file)
@@ -230,7 +230,7 @@ _on_item_changed(Elm_Flipselector_Data *sd)
 
    if (item->func)
      item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, EFL_UI_EVENT_SELECTED, eo_item);
 }
 
@@ -367,7 +367,7 @@ _flip_up(Elm_Flipselector_Data *sd)
    if (sd->current == sd->items)
      {
         sd->current = eina_list_last(sd->items);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (sd->obj, ELM_FLIPSELECTOR_EVENT_UNDERFLOWED, NULL);
      }
    else
@@ -392,7 +392,7 @@ _flip_down(Elm_Flipselector_Data *sd)
    if (!sd->current)
      {
         sd->current = sd->items;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (sd->obj, ELM_FLIPSELECTOR_EVENT_OVERFLOWED, NULL);
      }
 
index b0b6214..802b506 100644 (file)
@@ -460,7 +460,7 @@ _calc_job(void *data)
           {
              sd->minh = minh;
              sd->minw = minw;
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                    (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
           }
 
@@ -512,7 +512,7 @@ _item_unselect(Elm_Gen_Item *it)
      {
         it->selected = EINA_FALSE;
         sd->selected = eina_list_remove(sd->selected, eo_it);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (WIDGET(it), EFL_UI_EVENT_UNSELECTED, eo_it);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
@@ -572,7 +572,7 @@ _item_mouse_move_cb(void *data,
    if ((it->dragging) && (it->down))
      {
         ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
-        efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_DRAG, eo_it);
+        efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_DRAG, eo_it);
         return;
      }
 
@@ -645,25 +645,25 @@ _item_mouse_move_cb(void *data,
         if (dy < 0)
           {
              if (ady > adx)
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                      (WIDGET(it), EFL_UI_EVENT_DRAG_START_UP, eo_it);
              else
                {
                   if (dx < 0)
-                    efl_event_callback_call(WIDGET(it), left_drag, eo_it);
+                    efl_event_callback_legacy_call(WIDGET(it), left_drag, eo_it);
                }
           }
         else
           {
              if (ady > adx)
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                  (WIDGET(it), EFL_UI_EVENT_DRAG_START_DOWN, eo_it);
              else
                {
                   if (dx < 0)
-                    efl_event_callback_call(WIDGET(it), left_drag, eo_it);
+                    efl_event_callback_legacy_call(WIDGET(it), left_drag, eo_it);
                   else
-                    efl_event_callback_call(WIDGET(it), right_drag, eo_it);
+                    efl_event_callback_legacy_call(WIDGET(it), right_drag, eo_it);
                }
           }
      }
@@ -679,7 +679,7 @@ _long_press_cb(void *data)
    if (elm_wdg_item_disabled_get(EO_OBJ(it)) || (it->dragging))
      return ECORE_CALLBACK_CANCEL;
    sd->longpressed = EINA_TRUE;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
 
    if (sd->reorder_mode)
@@ -708,7 +708,7 @@ _item_highlight(Elm_Gen_Item *it)
      return;
 
    edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(it), ELM_GENGRID_EVENT_HIGHLIGHTED, EO_OBJ(it));
 
    selectraise = edje_object_data_get(VIEW(it), "selectraise");
@@ -729,7 +729,7 @@ _item_unhighlight(Elm_Gen_Item *it)
      return;
 
    edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
-   efl_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_UNHIGHLIGHTED, eo_it);
+   efl_event_callback_legacy_call(WIDGET(it), ELM_GENGRID_EVENT_UNHIGHLIGHTED, eo_it);
 
    evas_object_stack_below(VIEW(it), sd->stack);
 
@@ -776,11 +776,11 @@ _item_mouse_down_cb(void *data,
    it->highlight_cb(it);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      {
-        efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
-        efl_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, EO_OBJ(it));
+        efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
+        efl_event_callback_legacy_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, EO_OBJ(it));
      }
 
-   efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_PRESSED, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_PRESSED, EO_OBJ(it));
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
    if (it->realized)
      it->long_timer = ecore_timer_add
@@ -1002,7 +1002,7 @@ _elm_gengrid_item_unrealize(Elm_Gen_Item *it,
 
    evas_event_freeze(evas_object_evas_get(WIDGET(it)));
    if (!calc)
-     efl_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_UNREALIZED, EO_OBJ(it));
+     efl_event_callback_legacy_call(WIDGET(it), ELM_GENGRID_EVENT_UNREALIZED, EO_OBJ(it));
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
 
    _view_clear(VIEW(it), &(it->texts), &(it->contents));
@@ -1040,7 +1040,7 @@ _item_mouse_up_cb(void *data,
         if (dx < 0) dx = -dx;
         if (dy < 0) dy = -dy;
         if ((dx < 5) && (dy < 5))
-          efl_event_callback_call
+          efl_event_callback_legacy_call
             (WIDGET(it), EFL_UI_EVENT_CLICKED_RIGHT, EO_OBJ(it));
         return;
      }
@@ -1053,13 +1053,13 @@ _item_mouse_up_cb(void *data,
      sd->on_hold = EINA_TRUE;
    else sd->on_hold = EINA_FALSE;
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(it), ELM_GENGRID_EVENT_RELEASED, eo_it);
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
    if (it->dragging)
      {
         it->dragging = EINA_FALSE;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (WIDGET(it), EFL_UI_EVENT_DRAG_STOP, eo_it);
         dragged = EINA_TRUE;
      }
@@ -1067,7 +1067,7 @@ _item_mouse_up_cb(void *data,
    if ((sd->reorder_mode) &&
        (sd->reorder_it))
      {
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (WIDGET(it), ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder_it));
         sd->reorder_it = NULL;
         sd->move_effect_enabled = EINA_FALSE;
@@ -1207,7 +1207,7 @@ _elm_gengrid_item_index_update(Elm_Gen_Item *it)
 {
    if (it->position_update)
      {
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (WIDGET(it), ELM_GENGRID_EVENT_INDEX_UPDATE, EO_OBJ(it));
         it->position_update = EINA_FALSE;
      }
@@ -1640,7 +1640,7 @@ _item_place(Elm_Gen_Item *it,
         if (!was_realized)
           {
              _elm_gengrid_item_index_update(it);
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                (WIDGET(it), ELM_GENGRID_EVENT_REALIZED, EO_OBJ(it));
           }
         if (it->parent)
@@ -1839,7 +1839,7 @@ _group_item_place(Elm_Gengrid_Pan_Data *psd)
              if (!was_realized)
                {
                   _elm_gengrid_item_index_update(it);
-                  efl_event_callback_call
+                  efl_event_callback_legacy_call
                     (WIDGET(it), ELM_GENGRID_EVENT_REALIZED, EO_OBJ(it));
                }
              evas_object_move
@@ -1928,7 +1928,7 @@ _elm_gengrid_pan_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Elm_Gengr
         sd->move_effect_enabled = EINA_FALSE;
      }
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (psd->wobj, ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED, NULL);
 
    if (sd->focused_item)
@@ -2031,7 +2031,7 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
         _elm_widget_focus_highlight_start(obj);
      }
 
-   efl_event_callback_call(obj, ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it);
+   efl_event_callback_legacy_call(obj, ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -2061,7 +2061,7 @@ _elm_gengrid_item_unfocused(Elm_Object_Item *eo_it)
      }
 
    sd->focused_item = NULL;
-   efl_event_callback_call(obj, ELM_GENGRID_EVENT_ITEM_UNFOCUSED, eo_it);
+   efl_event_callback_legacy_call(obj, ELM_GENGRID_EVENT_ITEM_UNFOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 }
@@ -2857,9 +2857,9 @@ _item_move_cb(void *data, double pos)
           _free_reorder_normal_data(sd->reorder.data);
         elm_gengrid_item_show(EO_OBJ(sd->reorder.it1),
                               ELM_GENGRID_ITEM_SCROLLTO_IN);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (sd->obj, ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_STOP, EO_OBJ(sd->reorder.it1));
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (sd->obj, ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder.it1));
         sd->reorder.running = EINA_FALSE;
      }
@@ -2987,7 +2987,7 @@ _swap_items(Elm_Object_Item *eo_it1, Elm_Object_Item *eo_it2, Elm_Focus_Directio
           evas_object_raise(VIEW(rnd->corner_item));
      }
    evas_object_raise(VIEW(it1));
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_START, EO_OBJ(sd->reorder.it1));
    //TODO: Add elm config for time
    ecore_animator_timeline_add(0.3, _item_move_cb, sd);
@@ -3548,7 +3548,7 @@ _key_action_select(Evas_Object *obj, const char *params)
      }
 
    if (!sd->multi)
-     efl_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, eo_it);
+     efl_event_callback_legacy_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, eo_it);
 
    return EINA_TRUE;
 }
@@ -3907,70 +3907,70 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
                         void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
 _edge_left_cb(Evas_Object *obj,
               void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_LEFT, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENGRID_EVENT_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
                void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_RIGHT, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENGRID_EVENT_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
              void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_TOP, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENGRID_EVENT_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_BOTTOM, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENGRID_EVENT_EDGE_BOTTOM, NULL);
 }
 
 static void
 _scroll_page_change_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENGRID_EVENT_SCROLL_PAGE_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENGRID_EVENT_SCROLL_PAGE_CHANGED, NULL);
 }
 
 static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL, NULL);
 }
 
 static int
@@ -4136,7 +4136,7 @@ _internal_elm_gengrid_clear(Evas_Object *obj,
    if (sd->pan_obj)
      {
         evas_object_size_hint_min_set(sd->pan_obj, sd->minw, sd->minh);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
      }
    elm_interface_scrollable_content_region_show(obj, 0, 0, 0, 0);
@@ -4177,7 +4177,7 @@ _item_select(Elm_Gen_Item *it)
    if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
    if (it->generation == sd->generation)
      {
-        efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
+        efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
      }
index 3e5abf8..267ca9c 100644 (file)
@@ -643,7 +643,7 @@ _elm_genlist_item_unrealize(Elm_Gen_Item *it,
 
    evas_event_freeze(evas_object_evas_get(WIDGET(it)));
    if (!calc)
-     efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_UNREALIZED, EO_OBJ(it));
+     efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_UNREALIZED, EO_OBJ(it));
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
 
    _view_clear(VIEW(it), &(it->texts), NULL);
@@ -794,7 +794,7 @@ _calc_job(void *data)
      {
         sd->minw = minw;
         sd->minh = minh;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
         elm_layout_sizing_eval(sd->obj);
         if (sd->reorder_it)
@@ -1160,8 +1160,8 @@ _item_tree_effect_finish(Elm_Genlist_Data *sd)
    sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_NONE;
    sd->move_items = eina_list_free(sd->move_items);
 
-   efl_event_callback_call(sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
-   efl_event_callback_call
+   efl_event_callback_legacy_call(sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call
          (sd->obj, ELM_GENLIST_EVENT_TREE_EFFECT_FINISHED, NULL);
    evas_object_smart_changed(sd->pan_obj);
 
@@ -1338,7 +1338,7 @@ _elm_genlist_item_index_update(Elm_Gen_Item *it)
 {
    if (it->position_update || GL_IT(it)->block->position_update)
      {
-        efl_event_callback_call
+        efl_event_callback_legacy_call
               (WIDGET(it), ELM_GENLIST_EVENT_INDEX_UPDATE, EO_OBJ(it));
         it->position_update = EINA_FALSE;
      }
@@ -1442,9 +1442,9 @@ _expand_toggle_signal_cb(void *data,
    Elm_Gen_Item *it = data;
 
    if (it->item->expanded)
-     efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it));
+     efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it));
    else
-     efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it));
+     efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it));
 }
 
 static void
@@ -1456,7 +1456,7 @@ _expand_signal_cb(void *data,
    Elm_Gen_Item *it = data;
 
    if (!it->item->expanded)
-     efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it));
+     efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it));
 }
 
 static void
@@ -1468,7 +1468,7 @@ _contract_signal_cb(void *data,
    Elm_Gen_Item *it = data;
 
    if (it->item->expanded)
-     efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it));
+     efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it));
 }
 
 //-- item cache handle routine --//
@@ -1987,7 +1987,7 @@ _item_realize(Elm_Gen_Item *it,
 
           }
 
-        efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_REALIZED, EO_OBJ(it));
+        efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_REALIZED, EO_OBJ(it));
      }
 
    //Send a signal so that an item changes its style according to its expand depth
@@ -2548,7 +2548,7 @@ _elm_genlist_pan_efl_canvas_group_group_calculate(Eo *obj, Elm_Genlist_Pan_Data
    evas_event_thaw(evas_object_evas_get(obj));
    evas_event_thaw_eval(evas_object_evas_get(obj));
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
          (psd->wobj, ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED, NULL);
 }
 
@@ -2738,7 +2738,7 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
 
    if (it->realized)
      _elm_genlist_item_focus_update(it);
-   efl_event_callback_call(obj, ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it);
+   efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -2766,7 +2766,7 @@ _elm_genlist_item_unfocused(Elm_Object_Item *eo_it)
      }
 
    sd->focused_item = NULL;
-   efl_event_callback_call(obj, ELM_GENLIST_EVENT_ITEM_UNFOCUSED, eo_it);
+   efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_ITEM_UNFOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 }
@@ -3127,7 +3127,7 @@ _key_action_select(Evas_Object *obj, const char *params)
         if (_item_select(it)) goto deleted;
      }
 
-   efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_ACTIVATED, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_ACTIVATED, EO_OBJ(it));
 
    return EINA_TRUE;
 
@@ -3472,7 +3472,7 @@ _item_highlight(Elm_Gen_Item *it)
    edje_object_signal_emit(VIEW(it), SIGNAL_SELECTED, "elm");
    if (it->deco_all_view)
      edje_object_signal_emit(it->deco_all_view, SIGNAL_SELECTED, "elm");
-   efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_HIGHLIGHTED, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_HIGHLIGHTED, EO_OBJ(it));
 
    selectraise = edje_object_data_get(VIEW(it), "selectraise");
    if ((selectraise) && (!strcmp(selectraise, "on")))
@@ -3493,7 +3493,7 @@ _item_unhighlight(Elm_Gen_Item *it)
    if (!it->highlighted) return;
 
    edje_object_signal_emit(VIEW(it), SIGNAL_UNSELECTED, "elm");
-   efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it));
    if (it->deco_all_view)
      edje_object_signal_emit
        (it->deco_all_view, SIGNAL_UNSELECTED, "elm");
@@ -3794,7 +3794,7 @@ _item_unselect(Elm_Gen_Item *it)
 
    it->selected = EINA_FALSE;
    sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it));
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
@@ -3865,7 +3865,7 @@ _item_mouse_move_cb(void *data,
                sd->movements++;
           }
         ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (WIDGET(it), EFL_UI_EVENT_DRAG, eo_it);
         return;
      }
@@ -3942,30 +3942,30 @@ _item_mouse_move_cb(void *data,
         if (dy < 0)
           {
              if (ady > adx)
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                  (WIDGET(it), EFL_UI_EVENT_DRAG_START_UP, eo_it);
              else
                {
                   if (dx < 0)
-                    efl_event_callback_call
+                    efl_event_callback_legacy_call
                       (WIDGET(it), EFL_UI_EVENT_DRAG_START_LEFT, eo_it);
                   else
-                    efl_event_callback_call
+                    efl_event_callback_legacy_call
                       (WIDGET(it), EFL_UI_EVENT_DRAG_START_RIGHT, eo_it);
                }
           }
         else
           {
              if (ady > adx)
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                  (WIDGET(it), EFL_UI_EVENT_DRAG_START_DOWN, eo_it);
              else
                {
                   if (dx < 0)
-                    efl_event_callback_call
+                    efl_event_callback_legacy_call
                       (WIDGET(it), EFL_UI_EVENT_DRAG_START_LEFT, eo_it);
                   else
-                    efl_event_callback_call
+                    efl_event_callback_legacy_call
                       (WIDGET(it), EFL_UI_EVENT_DRAG_START_RIGHT, eo_it);
                }
           }
@@ -3985,7 +3985,7 @@ _long_press_cb(void *data)
      goto end;
 
    sd->longpressed = EINA_TRUE;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
          (WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
    if ((sd->reorder_mode) && !(GL_IT(it)->type & ELM_GENLIST_ITEM_GROUP))
      {
@@ -4042,7 +4042,7 @@ _swipe_do(Elm_Gen_Item *it)
 
    sum /= sd->movements;
    if (abs(sum - sd->history[0].x) <= 10) return;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
          (WIDGET(it), ELM_GENLIST_EVENT_SWIPE, EO_OBJ(it));
 }
 
@@ -4098,33 +4098,33 @@ _multi_touch_gesture_eval(Elm_Gen_Item *it)
         if ((off_x + off_mx) > (off_y + off_my))
           {
              if ((sd->cur_x > sd->prev_x) && (sd->cur_mx > sd->prev_mx))
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_SWIPE_RIGHT, eo_it);
              else if ((sd->cur_x < sd->prev_x) && (sd->cur_mx < sd->prev_mx))
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_SWIPE_LEFT, eo_it);
              else if (abs(sd->cur_x - sd->cur_mx) >
                       abs(sd->prev_x - sd->prev_mx))
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_PINCH_OUT, eo_it);
              else
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_PINCH_IN, eo_it);
           }
         else
           {
              if ((sd->cur_y > sd->prev_y) && (sd->cur_my > sd->prev_my))
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_SWIPE_DOWN, eo_it);
              else if ((sd->cur_y < sd->prev_y) && (sd->cur_my < sd->prev_my))
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_SWIPE_UP, eo_it);
              else if (abs(sd->cur_y - sd->cur_my) >
                       abs(sd->prev_y - sd->prev_my))
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_PINCH_OUT, eo_it);
              else
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                      (WIDGET(it), ELM_GENLIST_EVENT_MULTI_PINCH_IN, eo_it);
           }
      }
@@ -4158,7 +4158,7 @@ _item_multi_down_cb(void *data,
    if (it->dragging)
      {
         it->dragging = EINA_FALSE;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
               (WIDGET(it), EFL_UI_EVENT_DRAG_STOP, EO_OBJ(it));
      }
    ELM_SAFE_FREE(it->item->swipe_timer, ecore_timer_del);
@@ -4269,12 +4269,12 @@ _item_mouse_down_cb(void *data,
    _item_highlight(it);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      {
-        efl_event_callback_call
+        efl_event_callback_legacy_call
               (WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, eo_it);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
               (WIDGET(it), ELM_GENLIST_EVENT_ACTIVATED, eo_it);
      }
-   efl_event_callback_call
+   efl_event_callback_legacy_call
          (WIDGET(it), EFL_UI_EVENT_PRESSED, eo_it);
 }
 
@@ -4753,7 +4753,7 @@ _item_move_after(Elm_Gen_Item *it,
    if (after->item->group_item) it->item->group_item = after->item->group_item;
    _item_queue(sd, it, NULL);
 
-   efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED_AFTER, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED_AFTER, EO_OBJ(it));
 }
 
 static void
@@ -4831,7 +4831,7 @@ _item_move_before(Elm_Gen_Item *it,
      it->item->group_item = before->item->group_item;
    _item_queue(sd, it, NULL);
 
-   efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED_BEFORE, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED_BEFORE, EO_OBJ(it));
 }
 
 static void
@@ -4853,7 +4853,7 @@ _item_mouse_up_cb(void *data,
         if (dx < 0) dx = -dx;
         if (dy < 0) dy = -dy;
         if ((dx < 5) && (dy < 5))
-          efl_event_callback_call
+          efl_event_callback_legacy_call
                 (WIDGET(it), EFL_UI_EVENT_CLICKED_RIGHT, EO_OBJ(it));
         return;
      }
@@ -4863,7 +4863,7 @@ _item_mouse_up_cb(void *data,
    ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
 
    sd->mouse_down = EINA_FALSE;
-   efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_RELEASED, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_RELEASED, EO_OBJ(it));
    if (sd->multi_touched)
      {
         if ((!sd->multi) && (!it->selected) && (it->highlighted))
@@ -4879,7 +4879,7 @@ _item_mouse_up_cb(void *data,
    if (it->dragging)
      {
         it->dragging = EINA_FALSE;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
               (WIDGET(it), EFL_UI_EVENT_DRAG_STOP, EO_OBJ(it));
         dragged = 1;
      }
@@ -4910,7 +4910,7 @@ _item_mouse_up_cb(void *data,
                _item_move_before(sd->reorder_it, sd->reorder_rel);
              else
                _item_move_after(sd->reorder_it, sd->reorder_rel);
-             efl_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED, EO_OBJ(it));
+             efl_event_callback_legacy_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED, EO_OBJ(it));
           }
         else
           {
@@ -5294,105 +5294,105 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
                         void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
 _edge_left_cb(Evas_Object *obj,
               void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_LEFT, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
                void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_RIGHT, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
              void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_TOP, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_BOTTOM, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_EDGE_BOTTOM, NULL);
 }
 
 static void
 _vbar_drag_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENLIST_EVENT_VBAR_DRAG, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_VBAR_DRAG, NULL);
 }
 
 static void
 _vbar_press_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENLIST_EVENT_VBAR_PRESS, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_VBAR_PRESS, NULL);
 }
 
 static void
 _vbar_unpress_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENLIST_EVENT_VBAR_UNPRESS, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_VBAR_UNPRESS, NULL);
 }
 
 static void
 _hbar_drag_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENLIST_EVENT_HBAR_DRAG, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_HBAR_DRAG, NULL);
 }
 
 static void
 _hbar_press_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENLIST_EVENT_HBAR_PRESS, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_HBAR_PRESS, NULL);
 }
 
 static void
 _hbar_unpress_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_GENLIST_EVENT_HBAR_UNPRESS, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_HBAR_UNPRESS, NULL);
 }
 
 static void
@@ -5772,7 +5772,7 @@ _internal_elm_genlist_clear(Evas_Object *obj)
    if (sd->pan_obj)
      {
         evas_object_size_hint_min_set(sd->pan_obj, sd->minw, sd->minh);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
               (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
      }
    elm_layout_sizing_eval(sd->obj);
@@ -5838,7 +5838,7 @@ _item_select(Elm_Gen_Item *it)
    if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
    // delete item if it's requested deletion in the above callbacks.
    if ((it->base)->on_deletion) goto item_deleted;
-   efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
+   efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
    // delete item if it's requested deletion in the above callbacks.
@@ -6894,7 +6894,7 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B
         sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_EXPAND;
         if (it->realized)
           edje_object_signal_emit(VIEW(it), SIGNAL_EXPANDED, "elm");
-        efl_event_callback_call
+        efl_event_callback_legacy_call
               (WIDGET(it), ELM_GENLIST_EVENT_EXPANDED, EO_OBJ(it));
         sd->auto_scroll_enabled = EINA_TRUE;
         if (_elm_config->atspi_mode)
@@ -6905,7 +6905,7 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B
         sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_CONTRACT;
         if (it->realized)
           edje_object_signal_emit(VIEW(it), SIGNAL_CONTRACTED, "elm");
-        efl_event_callback_call
+        efl_event_callback_legacy_call
               (WIDGET(it), ELM_GENLIST_EVENT_CONTRACTED, EO_OBJ(it));
         sd->auto_scroll_enabled = EINA_FALSE;
         if (_elm_config->atspi_mode)
@@ -7631,7 +7631,7 @@ _item_filter_enterer(void *data)
    if (ok == ECORE_CALLBACK_CANCEL)
      {
         sd->queue_filter_enterer = NULL;
-        efl_event_callback_call(sd->obj, ELM_GENLIST_EVENT_FILTER_DONE, NULL);
+        efl_event_callback_legacy_call(sd->obj, ELM_GENLIST_EVENT_FILTER_DONE, NULL);
      }
 
    return ok;
index 4bed446..af88b15 100644 (file)
@@ -128,7 +128,7 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED)
    if (!sd->initialized)
      {
         //TODO:will be optimized
-        efl_event_callback_call(obj, ELM_GLVIEW_EVENT_CREATED, NULL);
+        efl_event_callback_legacy_call(obj, ELM_GLVIEW_EVENT_CREATED, NULL);
         if (sd->init_func) sd->init_func(obj);
         sd->initialized = EINA_TRUE;
      }
@@ -136,7 +136,7 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED)
    if (sd->resized)
      {
         //TODO:will be optimized
-        efl_event_callback_call(obj, ELM_GLVIEW_EVENT_RESIZED, NULL);
+        efl_event_callback_legacy_call(obj, ELM_GLVIEW_EVENT_RESIZED, NULL);
         if (sd->resize_func) sd->resize_func(obj);
         sd->resized = EINA_FALSE;
      }
@@ -146,7 +146,7 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED)
    // Call the render function
    if (sd->render_func) sd->render_func(obj);
    //TODO:will be optimized
-   efl_event_callback_call(obj, ELM_GLVIEW_EVENT_RENDER, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GLVIEW_EVENT_RENDER, NULL);
 
    // Depending on the policy return true or false
    if (sd->render_policy == ELM_GLVIEW_RENDER_POLICY_ON_DEMAND)
@@ -297,7 +297,7 @@ _elm_glview_efl_canvas_group_group_del(Eo *obj, Elm_Glview_Data *sd)
         sd->del_func(obj);
      }
    //TODO:will be optimised
-   efl_event_callback_call(obj, ELM_GLVIEW_EVENT_DESTROYED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_GLVIEW_EVENT_DESTROYED, NULL);
 
    efl_event_callback_del(ecore_main_loop_get(),
                          EFL_LOOP_EVENT_IDLE_ENTER,
index 0e33cab..e058f6d 100644 (file)
@@ -246,7 +246,7 @@ _elm_hover_smt_sub_re_eval(Evas_Object *obj)
    sd->smt_sub->obj = sub;
 
    if (sd->smt_sub != prev)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (obj, ELM_HOVER_EVENT_SMART_CHANGED, (void *)sd->smt_sub->swallow);
 
    if (elm_widget_mirrored_get(obj))
@@ -534,7 +534,7 @@ _hov_hide_cb(void *data,
    if (dismissstr && !strcmp(dismissstr, "on"))
      {
         evas_object_hide(data);
-        efl_event_callback_call(data, ELM_HOVER_EVENT_DISMISSED, NULL);
+        efl_event_callback_legacy_call(data, ELM_HOVER_EVENT_DISMISSED, NULL);
      }
 }
 
@@ -551,15 +551,15 @@ _hov_dismiss_cb(void *data,
    if (dismissstr && !strcmp(dismissstr, "on"))
      {
         _hide_signals_emit(data);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (data, EFL_UI_EVENT_CLICKED, NULL);
      }
    else
      {
         evas_object_hide(data);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (data, EFL_UI_EVENT_CLICKED, NULL);
-        efl_event_callback_call(data, ELM_HOVER_EVENT_DISMISSED, NULL);
+        efl_event_callback_legacy_call(data, ELM_HOVER_EVENT_DISMISSED, NULL);
      } // for backward compatibility
 }
 
@@ -602,9 +602,9 @@ _elm_hover_efl_canvas_group_group_del(Eo *obj, Elm_Hover_Data *sd)
 
    if (evas_object_visible_get(obj))
      {
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, EFL_UI_EVENT_CLICKED, NULL);
-        efl_event_callback_call(obj, ELM_HOVER_EVENT_DISMISSED, NULL);
+        efl_event_callback_legacy_call(obj, ELM_HOVER_EVENT_DISMISSED, NULL);
      }
 
    elm_hover_target_set(obj, NULL);
index 05d4dc6..4e5cd7f 100644 (file)
@@ -112,10 +112,10 @@ _icon_thumb_display(Elm_Icon_Data *sd)
          (sd->obj, sd->thumb.thumb.path, sd->thumb.thumb.key);
 
    if (ret)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (sd->obj, ELM_ICON_EVENT_THUMB_DONE, NULL);
    else
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (sd->obj, ELM_ICON_EVENT_THUMB_ERROR, NULL);
 
    return ret;
@@ -218,7 +218,7 @@ _icon_thumb_error(Ethumb_Client *client,
    ERR("could not generate thumbnail for %s (key: %s)",
        sd->thumb.file.path, sd->thumb.file.key);
 
-   efl_event_callback_call(sd->obj, ELM_ICON_EVENT_THUMB_ERROR, NULL);
+   efl_event_callback_legacy_call(sd->obj, ELM_ICON_EVENT_THUMB_ERROR, NULL);
 
    _icon_thumb_cleanup(client);
 }
index 11739ae..beb0563 100644 (file)
@@ -607,7 +607,7 @@ _delay_change_cb(void *data)
 
    if (item)
      {
-        efl_event_callback_call
+        efl_event_callback_legacy_call
               (data, ELM_INDEX_EVENT_DELAY_CHANGED, item);
         ELM_INDEX_ITEM_DATA_GET(item, it);
         _index_priority_change(data, it);
@@ -769,10 +769,10 @@ _sel_eval(Evas_Object *obj,
                     }
 
                   if (om_closest) 
-                    efl_event_callback_call
+                    efl_event_callback_legacy_call
                       (obj, ELM_INDEX_EVENT_CHANGED, EO_OBJ(om_closest));
                   else
-                    efl_event_callback_call
+                    efl_event_callback_legacy_call
                       (obj, ELM_INDEX_EVENT_CHANGED, EO_OBJ(it));
                   ecore_timer_del(sd->delay);
                   sd->delay = ecore_timer_add(sd->delay_change_time,
@@ -867,9 +867,9 @@ _on_mouse_up(void *data,
    eo_item = elm_index_selected_item_get(data, sd->level);
    if (eo_item)
      {
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (data, EFL_UI_EVENT_CLICKED, eo_item);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (data, EFL_UI_EVENT_SELECTED, eo_item);
         eo_id_item = eo_item;
         ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item);
@@ -918,7 +918,7 @@ _on_mouse_move(void *data,
                   sd->level = 1;
                   snprintf(buf, sizeof(buf), "elm,state,level,%i", sd->level);
                   elm_layout_signal_emit(data, buf, "elm");
-                  efl_event_callback_call
+                  efl_event_callback_legacy_call
                     (data, ELM_INDEX_EVENT_LEVEL_UP, NULL);
                }
           }
@@ -929,7 +929,7 @@ _on_mouse_move(void *data,
                   sd->level = 0;
                   snprintf(buf, sizeof(buf), "elm,state,level,%i", sd->level);
                   elm_layout_signal_emit(data, buf, "elm");
-                  efl_event_callback_call
+                  efl_event_callback_legacy_call
                     (data, ELM_INDEX_EVENT_LEVEL_DOWN, NULL);
                }
           }
@@ -1358,9 +1358,9 @@ _elm_index_item_selected_set(Eo *eo_it,
         edje_object_signal_emit(VIEW(it_active), "elm,state,active", "elm");
         edje_object_message_signal_process(VIEW(it_active));
 
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, ELM_INDEX_EVENT_CHANGED, eo_it);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, EFL_UI_EVENT_SELECTED, eo_it);
         ecore_timer_del(sd->delay);
         sd->delay = ecore_timer_add(sd->delay_change_time,
index 85f977c..67f955d 100644 (file)
@@ -135,7 +135,7 @@ _elm_pan_efl_canvas_group_group_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *
    psd->h = h;
 
    _elm_pan_update(psd);
-   efl_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static void
@@ -164,7 +164,7 @@ _elm_pan_pos_set(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Eva
    psd->py = y;
 
    _elm_pan_update(psd);
-   efl_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static void
@@ -252,7 +252,7 @@ _elm_pan_content_del_cb(void *data,
    psd->content = NULL;
    psd->content_w = psd->content_h = psd->px = psd->py =
            psd->prev_cw = psd->prev_ch = psd->delta_posx = psd->delta_posy = 0;
-   efl_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -272,7 +272,7 @@ _elm_pan_content_resize_cb(void *data,
         psd->content_h = h;
         _elm_pan_update(psd);
      }
-   efl_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -314,7 +314,7 @@ _elm_pan_content_set(Evas_Object *obj,
    _elm_pan_update(psd);
 
 end:
-   efl_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static void
index 2b0bdda..a9acf51 100644 (file)
@@ -362,7 +362,7 @@ _on_slide_end(void *data, Evas_Object *obj EINA_UNUSED,
    if (sd->slide_ellipsis)
      elm_obj_label_ellipsis_set(data, EINA_TRUE);
 
-   efl_event_callback_call(data, ELM_LABEL_EVENT_SLIDE_END, NULL);
+   efl_event_callback_legacy_call(data, ELM_LABEL_EVENT_SLIDE_END, NULL);
 }
 
 EOLIAN static void
index 53831bf..729563c 100644 (file)
@@ -353,7 +353,7 @@ _elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
      }
 
    if (ret)
-     efl_event_callback_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
+     efl_event_callback_legacy_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
 
    if (!_visuals_refresh(obj, sd))
      ret = ELM_THEME_APPLY_FAILED;
@@ -398,7 +398,7 @@ _elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED,
      {
         elm_layout_signal_emit(obj, "elm,action,focus", "elm");
         evas_object_focus_set(wd->resize_obj, EINA_TRUE);
-        efl_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
+        efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
         if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
      }
@@ -406,7 +406,7 @@ _elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED,
      {
         elm_layout_signal_emit(obj, "elm,action,unfocus", "elm");
         evas_object_focus_set(wd->resize_obj, EINA_FALSE);
-        efl_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
+        efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
         if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
      }
index a6d9804..e126500 100644 (file)
@@ -613,7 +613,7 @@ static Eina_Bool _key_action_select(Evas_Object *obj, const char *params EINA_UN
    if (eo_it)
      {
         ELM_LIST_ITEM_DATA_GET(eo_it, it);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (WIDGET(it), ELM_LIST_EVENT_ACTIVATED, eo_it);
      }
 
@@ -1155,7 +1155,7 @@ _elm_list_item_focused(Elm_Object_Item *eo_it)
    focus_raise = edje_object_data_get(VIEW(it), "focusraise");
    if ((focus_raise) && (!strcmp(focus_raise, "on")))
      evas_object_raise(VIEW(it));
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(it), ELM_LIST_EVENT_ITEM_FOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
@@ -1183,7 +1183,7 @@ _elm_list_item_unfocused(Elm_Object_Item *eo_it)
      }
 
    sd->focused_item = NULL;
-   efl_event_callback_call(obj, ELM_LIST_EVENT_ITEM_UNFOCUSED, eo_it);
+   efl_event_callback_legacy_call(obj, ELM_LIST_EVENT_ITEM_UNFOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 }
@@ -1361,7 +1361,7 @@ _item_highlight(Elm_List_Item_Data *it)
    _elm_list_walk(sd);
 
    edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
-   efl_event_callback_call(obj, ELM_LIST_EVENT_HIGHLIGHTED, EO_OBJ(it));
+   efl_event_callback_legacy_call(obj, ELM_LIST_EVENT_HIGHLIGHTED, EO_OBJ(it));
    select_raise = edje_object_data_get(VIEW(it), "selectraise");
    if ((select_raise) && (!strcmp(select_raise, "on")))
      evas_object_raise(VIEW(it));
@@ -1413,7 +1413,7 @@ call:
    _elm_list_walk(sd);
 
    if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
-   efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, eo_it);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, eo_it);
      if (_elm_config->atspi_mode)
        elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
    sd->last_selected_item = eo_it;
@@ -1440,7 +1440,7 @@ _item_unhighlight(Elm_List_Item_Data *it)
    _elm_list_walk(sd);
 
    edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_LIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it));
    stacking = edje_object_data_get(VIEW(it), "stacking");
    select_raise = edje_object_data_get(VIEW(it), "selectraise");
@@ -1482,7 +1482,7 @@ _item_unselect(Elm_List_Item_Data *it)
         sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
         if (!(it->base->disabled ||
               (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)))
-          efl_event_callback_call
+          efl_event_callback_legacy_call
             (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it));
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
@@ -1510,28 +1510,28 @@ static void
 _edge_left_cb(Evas_Object *obj,
               void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_LIST_EVENT_EDGE_LEFT, NULL);
+   efl_event_callback_legacy_call(obj, ELM_LIST_EVENT_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
                void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_LIST_EVENT_EDGE_RIGHT, NULL);
+   efl_event_callback_legacy_call(obj, ELM_LIST_EVENT_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
              void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_LIST_EVENT_EDGE_TOP, NULL);
+   efl_event_callback_legacy_call(obj, ELM_LIST_EVENT_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_LIST_EVENT_EDGE_BOTTOM, NULL);
+   efl_event_callback_legacy_call(obj, ELM_LIST_EVENT_EDGE_BOTTOM, NULL);
 }
 
 static Eina_Bool
@@ -1548,7 +1548,7 @@ _long_press_cb(void *data)
    if (it->base->disabled) goto end;
 
    sd->longpressed = EINA_TRUE;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
 
 end:
@@ -1573,7 +1573,7 @@ _swipe_do(Elm_List_Item_Data *it)
    sum /= sd->movements;
    if (abs(sum - sd->history[0].x) <= 10) return;
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(it), ELM_LIST_EVENT_SWIPE, EO_OBJ(it));
 }
 
@@ -1699,9 +1699,9 @@ _mouse_down_cb(void *data,
    /* Always call the callbacks last - the user may delete our context! */
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      {
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (WIDGET(it), ELM_LIST_EVENT_ACTIVATED, EO_OBJ(it));
      }
    sd->swipe = EINA_FALSE;
@@ -1735,7 +1735,7 @@ _mouse_up_cb(void *data,
         if (dx < 0) dx = -dx;
         if (dy < 0) dy = -dy;
         if ((dx < 5) && (dy < 5))
-          efl_event_callback_call
+          efl_event_callback_legacy_call
             (obj, EFL_UI_EVENT_CLICKED_RIGHT, EO_OBJ(it));
         return;
      }
index f6ced5a..30ef651 100644 (file)
@@ -599,7 +599,7 @@ _loaded_timeout_cb(void *data)
 
    sd->loaded_timer = NULL;
    if (!(sd->download_num) && !(sd->download_idler))
-      efl_event_callback_call
+      efl_event_callback_legacy_call
         (sd->obj, ELM_MAP_EVENT_LOADED, NULL);
    return ECORE_CALLBACK_CANCEL;
 }
@@ -751,7 +751,7 @@ _downloaded_cb(void *data,
 
         _grid_item_update(gi);
         gi->wsd->finish_num++;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           ((gi->wsd)->obj, ELM_MAP_EVENT_TILE_LOADED, NULL);
      }
    else
@@ -760,7 +760,7 @@ _downloaded_cb(void *data,
 
         ecore_file_remove(gi->file);
         gi->file_have = EINA_FALSE;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           ((gi->wsd)->obj, ELM_MAP_EVENT_TILE_LOADED_FAIL, NULL);
      }
 
@@ -809,7 +809,7 @@ _download_job(void *data)
            sd->download_list = eina_list_remove(sd->download_list, gi);
            sd->try_num++;
            sd->download_num++;
-           efl_event_callback_call
+           efl_event_callback_legacy_call
              (obj, ELM_MAP_EVENT_TILE_LOAD, NULL);
            if (sd->download_num == 1)
              edje_object_signal_emit(wd->resize_obj,
@@ -1070,7 +1070,7 @@ _zoom_timeout_cb(void *data)
 
    _smooth_update(sd);
    sd->zoom_timer = NULL;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
 
    return ECORE_CALLBACK_CANCEL;
@@ -1132,15 +1132,15 @@ _zoom_do(Elm_Map_Data *sd,
         sd->zoom_timer = NULL;
      }
    else
-      efl_event_callback_call
+      efl_event_callback_legacy_call
         (sd->obj, EFL_UI_EVENT_ZOOM_START, NULL);
 
    if (sd->obj)
      sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, ELM_MAP_EVENT_ZOOM_CHANGE, NULL);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
    evas_object_smart_changed(sd->pan_obj);
 }
@@ -1280,7 +1280,7 @@ _scr_timeout_cb(void *data)
 
    _smooth_update(sd);
    sd->scr_timer = NULL;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
 
    return ECORE_CALLBACK_CANCEL;
@@ -1294,11 +1294,11 @@ _scroll_cb(Evas_Object *obj,
 
    if (sd->scr_timer) ecore_timer_del(sd->scr_timer);
    else
-      efl_event_callback_call
+      efl_event_callback_legacy_call
         (sd->obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
    sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, EFL_UI_EVENT_SCROLL, NULL);
 }
 
@@ -1308,7 +1308,7 @@ _scroll_animate_start_cb(Evas_Object *obj,
 {
    ELM_MAP_DATA_GET(obj, sd);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
 }
 
@@ -1318,7 +1318,7 @@ _scroll_animate_stop_cb(Evas_Object *obj,
 {
    ELM_MAP_DATA_GET(obj, sd);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
@@ -1328,7 +1328,7 @@ _long_press_cb(void *data)
    ELM_MAP_DATA_GET(data, sd);
 
    sd->long_timer = NULL;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, EFL_UI_EVENT_LONGPRESSED, &sd->ev);
 
    return ECORE_CALLBACK_CANCEL;
@@ -1348,10 +1348,10 @@ _mouse_down_cb(void *data,
    else sd->on_hold = EINA_FALSE;
 
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (sd->obj, EFL_UI_EVENT_CLICKED_DOUBLE, ev);
    else
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (sd->obj, ELM_MAP_EVENT_PRESS, ev);
 
    ecore_timer_del(sd->long_timer);
@@ -1379,7 +1379,7 @@ _mouse_up_cb(void *data,
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
 
    if (!sd->on_hold)
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, EFL_UI_EVENT_CLICKED, ev);
    sd->on_hold = EINA_FALSE;
 }
@@ -1491,7 +1491,7 @@ _overlay_clicked_cb(void *data,
 
    EINA_SAFETY_ON_NULL_RETURN(data);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      ((overlay->wsd)->obj, ELM_MAP_EVENT_OVERLAY_CLICKED, overlay);
    if (overlay->cb)
      overlay->cb(overlay->cb_data, (overlay->wsd)->obj, overlay);
@@ -3078,14 +3078,14 @@ _route_cb(void *data,
         INF("Route request success from (%lf, %lf) to (%lf, %lf)",
             route->flon, route->flat, route->tlon, route->tlat);
         if (route->cb) route->cb(route->data, sd->obj, route);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (sd->obj, ELM_MAP_EVENT_ROUTE_LOADED, NULL);
      }
    else
      {
         ERR("Route request failed: %d", status);
         if (route->cb) route->cb(route->data, sd->obj, NULL);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (sd->obj, ELM_MAP_EVENT_ROUTE_LOADED_FAIL, NULL);
      }
 
@@ -3115,14 +3115,14 @@ _name_cb(void *data,
         INF("Name request success address:%s, lon:%lf, lat:%lf",
             name->address, name->lon, name->lat);
         if (name->cb) name->cb(name->data, sd->obj, name);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (sd->obj, ELM_MAP_EVENT_NAME_LOADED, NULL);
      }
    else
      {
         ERR("Name request failed: %d", status);
         if (name->cb) name->cb(name->data, sd->obj, NULL);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (sd->obj, ELM_MAP_EVENT_NAME_LOADED_FAIL, NULL);
      }
    edje_object_signal_emit(wd->resize_obj,
@@ -3152,7 +3152,7 @@ _name_list_cb(void *data,
         if (name_list->cb)
           name_list->cb(name_list->data, wd->obj,
                         name_list->names);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (wd->obj, ELM_MAP_EVENT_NAME_LOADED, NULL);
      }
    else
@@ -3160,7 +3160,7 @@ _name_list_cb(void *data,
         ERR("Name List request failed: %d", status);
         if (name_list->cb)
           name_list->cb(name_list->data, wd->obj, NULL);
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (wd->obj, ELM_MAP_EVENT_NAME_LOADED_FAIL, NULL);
      }
 
@@ -3238,7 +3238,7 @@ _name_request(const Evas_Object *obj,
    free(fname);
 
    sd->names = eina_list_append(sd->names, name);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, ELM_MAP_EVENT_NAME_LOAD, name);
    edje_object_signal_emit(wd->resize_obj,
                            "elm,state,busy,start", "elm");
@@ -3292,7 +3292,7 @@ _name_list_request(const Evas_Object *obj,
    free(url);
    free(fname);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (wd->obj, ELM_MAP_EVENT_NAME_LOAD, name_list->names);
    edje_object_signal_emit(wd->resize_obj,
                            "elm,state,busy,start", "elm");
@@ -4579,7 +4579,7 @@ _elm_map_route_add(Eo *obj, Elm_Map_Data *sd, Elm_Map_Route_Type type, Elm_Map_R
    free(url);
 
    sd->routes = eina_list_append(sd->routes, route);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (sd->obj, ELM_MAP_EVENT_ROUTE_LOAD, route);
    edje_object_signal_emit(wd->resize_obj,
                            "elm,state,busy,start", "elm");
@@ -4748,7 +4748,7 @@ elm_map_overlay_del(Elm_Map_Overlay *overlay)
    EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
    ELM_MAP_CHECK((overlay->wsd)->obj);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      ((overlay->wsd)->obj, ELM_MAP_EVENT_OVERLAY_DEL, overlay);
    if (overlay->del_cb)
      overlay->del_cb
index 8a4db47..c2cd644 100644 (file)
@@ -427,9 +427,9 @@ static void
 _hover_dismissed_cb(void *data, const Eo_Event *event)
 {
    _menu_hide(data, event->object, event->info);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_CLICKED, NULL);
-   efl_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL);
+   efl_event_callback_legacy_call(data, ELM_MENU_EVENT_DISMISSED, NULL);
 }
 
 static void
index 9d923c4..2a24a5a 100644 (file)
@@ -222,7 +222,7 @@ _block_area_clicked_cb(void *data,
                        const char *emission EINA_UNUSED,
                        const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, ELM_NOTIFY_EVENT_BLOCK_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, ELM_NOTIFY_EVENT_BLOCK_CLICKED, NULL);
 }
 
 EOLIAN static void
@@ -264,7 +264,7 @@ _timer_cb(void *data)
    if (!evas_object_visible_get(obj)) goto end;
 
    evas_object_hide(obj);
-   efl_event_callback_call(obj, ELM_NOTIFY_EVENT_TIMEOUT, NULL);
+   efl_event_callback_legacy_call(obj, ELM_NOTIFY_EVENT_TIMEOUT, NULL);
 
 end:
    return ECORE_CALLBACK_CANCEL;
@@ -448,7 +448,7 @@ _hide_finished_cb(void *data,
    evas_object_hide(sd->notify);
    if (!sd->allow_events) evas_object_hide(sd->block_events);
    efl_canvas_group_hide(efl_super(data, MY_CLASS));
-   efl_event_callback_call(data, ELM_NOTIFY_EVENT_DISMISSED, NULL);
+   efl_event_callback_legacy_call(data, ELM_NOTIFY_EVENT_DISMISSED, NULL);
 }
 
 EOLIAN static void
index 6b66825..db43b9a 100644 (file)
@@ -499,7 +499,7 @@ _panel_toggle(void *data EINA_UNUSED,
         edje_object_message_signal_process(wd->resize_obj);
      }
 
-   efl_event_callback_call(obj, ELM_PANEL_EVENT_TOGGLED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_PANEL_EVENT_TOGGLED, NULL);
 }
 
 static Eina_Bool
@@ -575,7 +575,7 @@ _state_sync(Evas_Object *obj)
         if (sd->hidden)
           {
              sd->hidden = EINA_FALSE;
-             efl_event_callback_call(obj, ELM_PANEL_EVENT_TOGGLED, NULL);
+             efl_event_callback_legacy_call(obj, ELM_PANEL_EVENT_TOGGLED, NULL);
           }
         elm_interface_scrollable_single_direction_set
               (obj, ELM_SCROLLER_SINGLE_DIRECTION_HARD);
@@ -596,7 +596,7 @@ _state_sync(Evas_Object *obj)
         if (!sd->hidden)
           {
              sd->hidden = EINA_TRUE;
-             efl_event_callback_call(obj, ELM_PANEL_EVENT_TOGGLED, NULL);
+             efl_event_callback_legacy_call(obj, ELM_PANEL_EVENT_TOGGLED, NULL);
           }
 
         if (horizontal)
@@ -1327,7 +1327,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
           }
         break;
      }
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL, (void *) &event);
 }
 
index 95978aa..3b70dc6 100644 (file)
@@ -141,7 +141,7 @@ _on_clicked(void *data,
             const char *emission EINA_UNUSED,
             const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static void
@@ -161,7 +161,7 @@ _on_pressed(void *data,
             const char *emission EINA_UNUSED,
             const char *source EINA_UNUSED)
 {
-   efl_event_callback_call(data, ELM_PANES_EVENT_PRESS, NULL);
+   efl_event_callback_legacy_call(data, ELM_PANES_EVENT_PRESS, NULL);
 }
 
 static void
@@ -171,11 +171,11 @@ _on_unpressed(void *data,
               const char *source EINA_UNUSED)
 {
    ELM_PANES_DATA_GET(data, sd);
-   efl_event_callback_call(data, ELM_PANES_EVENT_UNPRESS, NULL);
+   efl_event_callback_legacy_call(data, ELM_PANES_EVENT_UNPRESS, NULL);
 
    if (sd->double_clicked)
      {
-        efl_event_callback_call(data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
+        efl_event_callback_legacy_call(data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
         sd->double_clicked = EINA_FALSE;
      }
 }
index f0e1ee9..3431aca 100644 (file)
@@ -109,7 +109,7 @@ _drag_done_cb(void *unused EINA_UNUSED,
    ELM_PHOTO_DATA_GET(obj, sd);
 
    elm_object_scroll_freeze_pop(obj);
-   efl_event_callback_call(obj, EFL_UI_EVENT_DRAG_END, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_DRAG_END, NULL);
    sd->drag_started = EINA_FALSE;
 }
 
@@ -173,7 +173,7 @@ _long_press_cb(void *obj)
                   _drag_done_cb, NULL))
           {
              elm_object_scroll_freeze_push(obj);
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                (obj, EFL_UI_EVENT_DRAG_START, NULL);
              sd->drag_started = EINA_TRUE;
           }
@@ -216,7 +216,7 @@ _mouse_up(void *data,
    ELM_SAFE_FREE(sd->long_press_timer, ecore_timer_del);
 
    if (!sd->drag_started)
-     efl_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
+     efl_event_callback_legacy_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 static void
index 08c11ab..831bcb1 100644 (file)
@@ -137,7 +137,7 @@ _calc_job_cb(void *data)
         sd->minw = minw;
         sd->minh = minh;
 
-        efl_event_callback_call(sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
+        efl_event_callback_legacy_call(sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
         _sizing_eval(obj);
      }
    sd->calc_job = NULL;
@@ -258,7 +258,7 @@ _grid_load(Evas_Object *obj,
                        edje_object_signal_emit
                          (wd->resize_obj,
                          "elm,state,busy,start", "elm");
-                       efl_event_callback_call
+                       efl_event_callback_legacy_call
                         (obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL);
                     }
                }
@@ -270,7 +270,7 @@ _grid_load(Evas_Object *obj,
                        edje_object_signal_emit
                          (wd->resize_obj,
                          "elm,state,busy,stop", "elm");
-                       efl_event_callback_call
+                       efl_event_callback_legacy_call
                         (obj, ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL);
                     }
                   g->grid[tn].want = 0;
@@ -468,7 +468,7 @@ _grid_clear(Evas_Object *obj,
                        edje_object_signal_emit
                          (wd->resize_obj,
                          "elm,state,busy,stop", "elm");
-                       efl_event_callback_call
+                       efl_event_callback_legacy_call
                          (obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL);
                     }
                }
@@ -501,7 +501,7 @@ _tile_preloaded_cb(void *data,
              edje_object_signal_emit
                (wd->resize_obj, "elm,state,busy,stop",
                "elm");
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                (wd->obj, ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL);
           }
      }
@@ -699,13 +699,13 @@ _main_img_preloaded_cb(void *data,
      }
    ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job_cb, data);
-   efl_event_callback_call(data, ELM_PHOTOCAM_EVENT_LOADED, NULL);
+   efl_event_callback_legacy_call(data, ELM_PHOTOCAM_EVENT_LOADED, NULL);
    sd->preload_num--;
    if (!sd->preload_num)
      {
         edje_object_signal_emit
           (wd->resize_obj, "elm,state,busy,stop", "elm");
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL);
      }
 }
@@ -788,7 +788,7 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
         sd->no_smooth--;
         if (!sd->no_smooth) _smooth_update(data);
         efl_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
-        efl_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
+        efl_event_callback_legacy_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
      }
 }
 
@@ -799,7 +799,7 @@ _long_press_cb(void *data)
 
    sd->long_timer = NULL;
    sd->longpressed = EINA_TRUE;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (data, EFL_UI_EVENT_LONGPRESSED, NULL);
 
    return ECORE_CALLBACK_CANCEL;
@@ -819,10 +819,10 @@ _mouse_down_cb(void *data,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = EINA_TRUE;
    else sd->on_hold = EINA_FALSE;
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
    else
-     efl_event_callback_call(data, ELM_PHOTOCAM_EVENT_PRESS, NULL);
+     efl_event_callback_legacy_call(data, ELM_PHOTOCAM_EVENT_PRESS, NULL);
    sd->longpressed = EINA_FALSE;
    ecore_timer_del(sd->long_timer);
    sd->long_timer = ecore_timer_add
@@ -844,7 +844,7 @@ _mouse_up_cb(void *data,
    else sd->on_hold = EINA_FALSE;
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
    if (!sd->on_hold)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (data, EFL_UI_EVENT_CLICKED, NULL);
    sd->on_hold = EINA_FALSE;
 }
@@ -890,7 +890,7 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
 }
 
@@ -898,7 +898,7 @@ static void
 _scroll_animate_stop_cb(Evas_Object *obj,
                         void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
@@ -906,7 +906,7 @@ static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
 }
 
@@ -914,7 +914,7 @@ static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
@@ -933,7 +933,7 @@ _scroll_cb(Evas_Object *obj,
    ecore_timer_del(sd->scr_timer);
    sd->scr_timer = ecore_timer_add(0.5, _scroll_timeout_cb, obj);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL, NULL);
 }
 
@@ -1101,7 +1101,7 @@ _elm_photocam_zoom_reset(Eo *obj, Elm_Photocam_Data *sd)
         sd->no_smooth--;
         if (!sd->no_smooth) _smooth_update(obj);
         _zoom_do(obj, 1.0);
-        efl_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
+        efl_event_callback_legacy_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
      }
 }
 
@@ -1566,13 +1566,13 @@ _internal_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file, Eina_File *
    sd->main_load_pending = EINA_TRUE;
 
    sd->calc_job = ecore_job_add(_calc_job_cb, obj);
-   efl_event_callback_call(obj, ELM_PHOTOCAM_EVENT_LOAD, NULL);
+   efl_event_callback_legacy_call(obj, ELM_PHOTOCAM_EVENT_LOAD, NULL);
    sd->preload_num++;
    if (sd->preload_num == 1)
      {
         edje_object_signal_emit
           (wd->resize_obj, "elm,state,busy,start", "elm");
-        efl_event_callback_call(obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL);
+        efl_event_callback_legacy_call(obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL);
      }
 
    tz = sd->zoom;
@@ -1608,12 +1608,12 @@ _elm_photocam_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf *d
 
         free(sd->remote_data);
         sd->remote_data = NULL;
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err);
      }
    else
      {
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_DONE, NULL);
      }
 
@@ -1627,7 +1627,7 @@ _elm_photocam_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int error)
    Elm_Photocam_Data *sd = efl_data_scope_get(obj, MY_CLASS);
    Elm_Photocam_Error err = { error, EINA_FALSE };
 
-   efl_event_callback_call(obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err);
+   efl_event_callback_legacy_call(obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err);
 
    sd->remote = NULL;
 }
@@ -1640,7 +1640,7 @@ _elm_photocam_download_progress(void *data, Elm_Url *url EINA_UNUSED, double now
 
    progress.now = now;
    progress.total = total;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_PROGRESS, &progress);
 }
 
@@ -1681,7 +1681,7 @@ _elm_photocam_file_set_internal(Eo *obj, Elm_Photocam_Data *sd, const char *file
                                         obj);
           if (sd->remote)
             {
-               efl_event_callback_call
+               efl_event_callback_legacy_call
                  (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_START, NULL);
                return ret;
             }
@@ -1966,12 +1966,12 @@ done:
    if (!sd->paused)
      {
         if (started)
-          efl_event_callback_call(obj, EFL_UI_EVENT_ZOOM_START, NULL);
+          efl_event_callback_legacy_call(obj, EFL_UI_EVENT_ZOOM_START, NULL);
         if (!an)
-          efl_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
+          efl_event_callback_legacy_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
      }
    if (zoom_changed)
-     efl_event_callback_call(obj, EFL_UI_EVENT_ZOOM_CHANGE, NULL);
+     efl_event_callback_legacy_call(obj, EFL_UI_EVENT_ZOOM_CHANGE, NULL);
 }
 
 EOLIAN static double
index 957a994..a975acc 100644 (file)
@@ -42,7 +42,7 @@ _elm_plug_disconnected(Ecore_Evas *ee)
 {
    Evas_Object *plug = ecore_evas_data_get(ee, PLUG_KEY);
    EINA_SAFETY_ON_NULL_RETURN(plug);
-   efl_event_callback_call(plug, ELM_PLUG_EVENT_IMAGE_DELETED, NULL);
+   efl_event_callback_legacy_call(plug, ELM_PLUG_EVENT_IMAGE_DELETED, NULL);
    /* TODO: was a typo. Deprecated, remove in future releases: */
    evas_object_smart_callback_call(plug, "image.deleted", NULL);
 }
@@ -55,7 +55,7 @@ _elm_plug_resized(Ecore_Evas *ee)
    EINA_SAFETY_ON_NULL_RETURN(plug);
 
    ecore_evas_geometry_get(ee, NULL, NULL, &(size.w), &(size.h));
-   efl_event_callback_call(plug, ELM_PLUG_EVENT_IMAGE_RESIZED, &size);
+   efl_event_callback_legacy_call(plug, ELM_PLUG_EVENT_IMAGE_RESIZED, &size);
 }
 
 EOLIAN static Eina_Bool
@@ -103,7 +103,7 @@ _on_mouse_up(void *data,
    if (ev->button != 1) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   efl_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
+   efl_event_callback_legacy_call(data, EFL_UI_EVENT_CLICKED, NULL);
 }
 
 EOLIAN static void
index ac5214f..03b88c5 100644 (file)
@@ -136,7 +136,7 @@ _elm_prefs_save(void *data)
      {
         elm_prefs_data_save(sd->prefs_data, NULL, NULL);
 
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (wd->obj, ELM_PREFS_EVENT_PAGE_SAVED, (char *)sd->root->name);
      }
 
@@ -300,7 +300,7 @@ _elm_prefs_item_changed_report(Eo *obj,
 
    snprintf(buf, sizeof(buf), "%s:%s", it->page->name, it->name);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (wd->obj, ELM_PREFS_EVENT_ITEM_CHANGED, buf);
 }
 
@@ -400,7 +400,7 @@ _prefs_data_autosaved_cb(void *cb_data,
    ELM_PREFS_DATA_GET(cb_data, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(cb_data, wd);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (wd->obj, ELM_PREFS_EVENT_PAGE_SAVED, event_info);
 
    sd->dirty = EINA_FALSE;
@@ -555,7 +555,7 @@ _item_changed_cb(Evas_Object *it_obj)
    /* we use the changed cb on ACTION/RESET/SAVE items specially */
    if (it->type == ELM_PREFS_TYPE_ACTION)
      {
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (wd->obj, ELM_PREFS_EVENT_ACTION, buf);
 
         return;
@@ -1174,7 +1174,7 @@ _elm_prefs_efl_file_file_set(Eo *obj, Elm_Prefs_Data *sd, const char *file, cons
 
    _elm_prefs_values_get_default(sd->root, EINA_FALSE);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_PREFS_EVENT_PAGE_LOADED, (char *)sd->root->name);
 
    return EINA_TRUE;
@@ -1219,7 +1219,7 @@ _elm_prefs_data_set(Eo *obj, Elm_Prefs_Data *sd, Elm_Prefs_Data *prefs_data)
    sd->values_fetching = EINA_FALSE;
 
 end:
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_PREFS_EVENT_PAGE_CHANGED, (char *)sd->root->name);
 
    return EINA_TRUE;
index 99f375d..994c9f3 100644 (file)
@@ -509,7 +509,7 @@ _elm_progressbar_part_value_set(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd, c
 
    _val_set(obj);
    _units_set(obj);
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_PROGRESSBAR_EVENT_CHANGED, NULL);
 }
 
index c23087b..cc2430d 100644 (file)
@@ -118,7 +118,7 @@ _activate(Evas_Object *obj)
 
         if (_elm_config->access_mode)
           _elm_access_say(E_("State: On"));
-        efl_event_callback_call
+        efl_event_callback_legacy_call
           (obj, ELM_RADIO_EVENT_CHANGED, NULL);
 
      }
index cdc4e16..bf8c617 100644 (file)
@@ -572,35 +572,35 @@ static void
 _edge_left_cb(Evas_Object *obj,
               void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_LEFT, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
                void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_RIGHT, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
              void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_TOP, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_BOTTOM, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_EDGE_BOTTOM, NULL);
 }
 
 static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL, NULL);
 }
 
@@ -608,35 +608,35 @@ static void
 _scroll_left_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_LEFT, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_SCROLL_LEFT, NULL);
 }
 
 static void
 _scroll_right_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_RIGHT, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_SCROLL_RIGHT, NULL);
 }
 
 static void
 _scroll_up_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_UP, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_SCROLL_UP, NULL);
 }
 
 static void
 _scroll_down_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_DOWN, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_SCROLL_DOWN, NULL);
 }
 
 static void
 _scroll_anim_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
 }
 
@@ -644,7 +644,7 @@ static void
 _scroll_anim_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
@@ -652,7 +652,7 @@ static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
 }
 
@@ -660,7 +660,7 @@ static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
@@ -668,49 +668,49 @@ static void
 _vbar_drag_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_VBAR_DRAG, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_VBAR_DRAG, NULL);
 }
 
 static void
 _vbar_press_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_VBAR_PRESS, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_VBAR_PRESS, NULL);
 }
 
 static void
 _vbar_unpress_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_VBAR_UNPRESS, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_VBAR_UNPRESS, NULL);
 }
 
 static void
 _hbar_drag_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_HBAR_DRAG, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_HBAR_DRAG, NULL);
 }
 
 static void
 _hbar_press_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_HBAR_PRESS, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_HBAR_PRESS, NULL);
 }
 
 static void
 _hbar_unpress_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, ELM_SCROLLER_EVENT_HBAR_UNPRESS, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SCROLLER_EVENT_HBAR_UNPRESS, NULL);
 }
 
 static void
 _page_change_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_SCROLLER_EVENT_SCROLL_PAGE_CHANGED, NULL);
 }
 
index baaf531..bc1f2fe 100644 (file)
@@ -317,7 +317,7 @@ _segment_on(Elm_Segment_Control_Item_Data *it)
    edje_object_signal_emit(VIEW(it), "elm,state,segment,selected", "elm");
 
    sd->selected_item = it;
-   efl_event_callback_call(sd->obj, ELM_SEGMENT_CONTROL_EVENT_CHANGED, EO_OBJ(it));
+   efl_event_callback_legacy_call(sd->obj, ELM_SEGMENT_CONTROL_EVENT_CHANGED, EO_OBJ(it));
 }
 
 static void
index 24ed47c..68386f0 100644 (file)
@@ -64,7 +64,7 @@ _delay_change(void *data)
    ELM_SLIDER_DATA_GET(data, sd);
 
    sd->delay = NULL;
-   efl_event_callback_call(data, ELM_SLIDER_EVENT_DELAY_CHANGED, NULL);
+   efl_event_callback_legacy_call(data, ELM_SLIDER_EVENT_DELAY_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_value_changed_signal_emit(data);
@@ -149,7 +149,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
         sd->range_from = val;
         if (user_event)
           {
-             efl_event_callback_call(obj, ELM_SLIDER_EVENT_CHANGED, NULL);
+             efl_event_callback_legacy_call(obj, ELM_SLIDER_EVENT_CHANGED, NULL);
              ecore_timer_del(sd->delay);
              sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
           }
@@ -159,7 +159,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
         sd->range_to = val2;
         if (user_event)
           {
-             efl_event_callback_call(obj, ELM_SLIDER_EVENT_CHANGED, NULL);
+             efl_event_callback_legacy_call(obj, ELM_SLIDER_EVENT_CHANGED, NULL);
              ecore_timer_del(sd->delay);
              sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
           }
@@ -356,7 +356,7 @@ _drag_start(void *data,
    if (!elm_widget_focus_get(data))
      elm_object_focus_set(data, EINA_TRUE);
    _slider_update(data, EINA_TRUE);
-   efl_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
+   efl_event_callback_legacy_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
    elm_widget_scroll_freeze_push(data);
 }
 
@@ -367,7 +367,7 @@ _drag_stop(void *data,
            const char *source EINA_UNUSED)
 {
    _slider_update(data, EINA_TRUE);
-   efl_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
+   efl_event_callback_legacy_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
    elm_widget_scroll_freeze_pop(data);
 }
 
@@ -948,7 +948,7 @@ _spacer_down_cb(void *data,
    if (!elm_widget_focus_get(data))
      elm_object_focus_set(data, EINA_TRUE);
    _slider_update(data, EINA_TRUE);
-   efl_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
+   efl_event_callback_legacy_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
    elm_layout_signal_emit(data, "elm,state,indicator,show", "elm");
 }
 
@@ -986,7 +986,7 @@ _spacer_move_cb(void *data,
           {
              if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
              _slider_update(data, EINA_TRUE);
-             efl_event_callback_call
+             efl_event_callback_legacy_call
                (data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
              if (sd->frozen)
                {
@@ -1027,7 +1027,7 @@ _spacer_up_cb(void *data,
    if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
 
    _slider_update(data, EINA_TRUE);
-   efl_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
+   efl_event_callback_legacy_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
 
    if (sd->frozen)
      {
@@ -1644,12 +1644,12 @@ _elm_slider_elm_interface_atspi_value_value_and_text_set(Eo *obj, Elm_Slider_Dat
    if (sd->val_min > value) return EINA_FALSE;
    if (sd->val_max < value) return EINA_FALSE;
 
-   efl_event_callback_call(obj, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
    sd->val = value;
    _visuals_refresh(obj);
    sd->val = oldval;
    _slider_update(obj, EINA_TRUE);
-   efl_event_callback_call(obj, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
 
    return EINA_TRUE;
 }
index e856139..2fb9bd9 100644 (file)
@@ -272,7 +272,7 @@ _on_slideshow_end(void *data,
    elm_layout_signal_emit(data, "anim,end", "slideshow");
 
    if (emission != NULL)
-     efl_event_callback_call
+     efl_event_callback_legacy_call
        (data, ELM_SLIDESHOW_EVENT_TRANSITION_END, EO_OBJ(sd->current));
 }
 
@@ -481,7 +481,7 @@ _elm_slideshow_item_show(Eo *eo_item EINA_UNUSED, Elm_Slideshow_Item_Data *item)
 
    sd->previous = sd->current;
    sd->current = next;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (WIDGET(item), ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current));
 }
 
@@ -519,7 +519,7 @@ _elm_slideshow_next(Eo *obj, Elm_Slideshow_Data *sd)
 
    sd->previous = sd->current;
    sd->current = next;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current));
 }
 
@@ -557,7 +557,7 @@ _elm_slideshow_previous(Eo *obj, Elm_Slideshow_Data *sd)
 
    sd->previous = sd->current;
    sd->current = prev;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current));
 }
 
index 04478ea..c64addb 100644 (file)
@@ -233,7 +233,7 @@ _delay_change_timer_cb(void *data)
    ELM_SPINNER_DATA_GET(data, sd);
 
    sd->delay_change_timer = NULL;
-   efl_event_callback_call(data, ELM_SPINNER_EVENT_DELAY_CHANGED, NULL);
+   efl_event_callback_legacy_call(data, ELM_SPINNER_EVENT_DELAY_CHANGED, NULL);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -266,7 +266,7 @@ _value_set(Evas_Object *obj,
    if (new_val == sd->val) return EINA_FALSE;
    sd->val = new_val;
 
-   efl_event_callback_call(obj, ELM_SPINNER_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SPINNER_EVENT_CHANGED, NULL);
    elm_interface_atspi_accessible_value_changed_signal_emit(obj);
    ecore_timer_del(sd->delay_change_timer);
    sd->delay_change_timer = ecore_timer_add(ELM_SPINNER_DELAY_CHANGE_TIME,
@@ -349,7 +349,7 @@ _drag_start_cb(void *data,
    sd->drag_prev_pos = 0;
    sd->drag_val_step = 1;
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_SPINNER_EVENT_SPINNER_DRAG_START, NULL);
 }
 
@@ -367,7 +367,7 @@ _drag_stop_cb(void *data,
    edje_object_part_drag_value_set
      (wd->resize_obj, "elm.dragable.slider", 0.0, 0.0);
 
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_SPINNER_EVENT_SPINNER_DRAG_STOP, NULL);
 }
 
@@ -406,7 +406,7 @@ _entry_value_apply(Evas_Object *obj)
    if (((*end != '\0') && (!isspace(*end))) || (fabs(val - sd->val) < DBL_EPSILON)) return;
    elm_spinner_value_set(obj, val);
 
-   efl_event_callback_call(obj, ELM_SPINNER_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_SPINNER_EVENT_CHANGED, NULL);
    ecore_timer_del(sd->delay_change_timer);
    sd->delay_change_timer = ecore_timer_add(ELM_SPINNER_DELAY_CHANGE_TIME,
                                             _delay_change_timer_cb, obj);
index dde82a3..491407a 100644 (file)
@@ -62,9 +62,9 @@ _mouse_down_cb(void *data,
    else sd->on_hold = EINA_FALSE;
 
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
+     efl_event_callback_legacy_call(obj, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
    else
-     efl_event_callback_call(obj, ELM_THUMB_EVENT_PRESS, NULL);
+     efl_event_callback_legacy_call(obj, ELM_THUMB_EVENT_PRESS, NULL);
 }
 
 static void
@@ -81,7 +81,7 @@ _mouse_up_cb(void *data,
    else sd->on_hold = EINA_FALSE;
 
    if (!sd->on_hold)
-     efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
+     efl_event_callback_legacy_call(obj, EFL_UI_EVENT_CLICKED, NULL);
 
    sd->on_hold = EINA_FALSE;
 }
@@ -113,7 +113,7 @@ _thumb_ready_inform(Elm_Thumb_Data *sd,
    eina_stringshare_replace(&(sd->thumb.key), thumb_key);
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm");
-   efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
+   efl_event_callback_legacy_call(sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
 }
 
 static void
@@ -288,14 +288,14 @@ _thumb_finish(Elm_Thumb_Data *sd,
 
           wd = efl_data_scope_get(sd->obj, ELM_WIDGET_CLASS);
           edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
-          efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
+          efl_event_callback_legacy_call(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
        }
 
    return;
 
 err:
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
-   efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
+   efl_event_callback_legacy_call(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
 }
 
 static void
@@ -341,7 +341,7 @@ _on_ethumb_thumb_error(Ethumb_Client *client EINA_UNUSED,
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_ERROR, "elm");
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
-   efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_ERROR, NULL);
+   efl_event_callback_legacy_call(sd->obj, ELM_THUMB_EVENT_GENERATE_ERROR, NULL);
 }
 
 static void
@@ -380,7 +380,7 @@ _thumb_start(Elm_Thumb_Data *sd)
    ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd);
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_START, "elm");
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_START, "elm");
-   efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_START, NULL);
+   efl_event_callback_legacy_call(sd->obj, ELM_THUMB_EVENT_GENERATE_START, NULL);
 
    pending_request++;
    ethumb_client_file_set(_elm_ethumb_client, sd->file, sd->key);
@@ -473,7 +473,7 @@ _elm_thumb_efl_canvas_group_group_hide(Eo *obj, Elm_Thumb_Data *sd)
         sd->thumb.request = NULL;
 
         edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm");
-        efl_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
+        efl_event_callback_legacy_call(sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
      }
 
    if (sd->thumb.retry)
index c8f3df9..767b8b5 100644 (file)
@@ -159,7 +159,7 @@ _item_unselect(Elm_Toolbar_Item_Data *item)
    elm_layout_signal_emit(VIEW(item), "elm,state,unselected", "elm");
    if (item->icon)
      elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm");
-   efl_event_callback_call(WIDGET(item), EFL_UI_EVENT_UNSELECTED, EO_OBJ(item));
+   efl_event_callback_legacy_call(WIDGET(item), EFL_UI_EVENT_UNSELECTED, EO_OBJ(item));
    if (_elm_config->atspi_mode)
     elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
 }
@@ -633,7 +633,7 @@ _elm_toolbar_item_focused(Elm_Object_Item *eo_it)
    focus_raise = elm_layout_data_get(VIEW(it), "focusraise");
    if ((focus_raise) && (!strcmp(focus_raise, "on")))
      evas_object_raise(VIEW(it));
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_TOOLBAR_EVENT_ITEM_FOCUSED, EO_OBJ(it));
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
@@ -660,7 +660,7 @@ _elm_toolbar_item_unfocused(Elm_Object_Item *eo_it)
    elm_layout_signal_emit
       (VIEW(it), "elm,highlight,off", "elm");
    sd->focused_item = NULL;
-   efl_event_callback_call
+   efl_event_callback_legacy_call
      (obj, ELM_TOOLBAR_EVENT_ITEM_UNFOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
@@ -1174,7 +1174,7 @@ _item_select(Elm_Toolbar_Item_Data *it)
      {
         if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it));
      }
-   efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, EO_OBJ(it));
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, EO_OBJ(it));
    if (_elm_config->atspi_mode)
     elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
 }
@@ -1813,7 +1813,7 @@ _mouse_clicked_cb(Elm_Toolbar_Item_Data *it,
    if (button == 1)
      {
         /* regular left click event */
-        efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED, EO_OBJ(it));
+        efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_CLICKED, EO_OBJ(it));
         return;
      }
    snprintf(buf, sizeof(buf), "elm,action,click,%d", button);
@@ -2205,7 +2205,7 @@ _long_press_cb(void *data)
    if (sd->reorder_mode)
      _item_reorder_start(it);
 
-   efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
+   efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -2238,7 +2238,7 @@ _mouse_down_cb(Elm_Toolbar_Item_Data *it,
 
    if (ev->button != 1) return;
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     efl_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
+     efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
    sd->mouse_down = EINA_TRUE;
    sd->long_press = EINA_FALSE;
    if (sd->long_timer)
@@ -2305,21 +2305,21 @@ static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL, NULL);
 }
 
 static void
 _scroll_anim_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_anim_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
@@ -2329,14 +2329,14 @@ _scroll_drag_start_cb(Evas_Object *obj,
    ELM_TOOLBAR_DATA_GET(obj, sd);
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
 
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   efl_event_callback_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
+   efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
index 397f758..aed293d 100644 (file)
@@ -70,7 +70,7 @@ _item_sel_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
 
    EINA_SAFETY_ON_NULL_RETURN(idata);
 
-   efl_event_callback_call(idata->priv->view, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, idata->model);
+   efl_event_callback_legacy_call(idata->priv->view, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, idata->model);
 }
 
 static void
index c7e0185..b73661c 100644 (file)
@@ -942,7 +942,7 @@ elm_widget_access(Evas_Object *obj,
      }
 
    elm_obj_widget_access(obj, is_access);
-   efl_event_callback_call(obj, ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL);
 
    return ret;
 }
@@ -3666,7 +3666,7 @@ _elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSE
         sd->on_translate = EINA_FALSE;
      }
 #endif
-   efl_event_callback_call(obj, ELM_WIDGET_EVENT_LANGUAGE_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_LANGUAGE_CHANGED, NULL);
    return EINA_TRUE;
 }
 
@@ -5867,7 +5867,7 @@ _elm_widget_on_focus(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *item E
 
    if (!sd->resize_obj)
      evas_object_focus_set(obj, focused);
-   efl_event_callback_call(obj, desc, NULL);
+   efl_event_callback_legacy_call(obj, desc, NULL);
 
    if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
      elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, focused);
index f9302e5..044d63c 100644 (file)
@@ -1310,7 +1310,7 @@ _eio_load_xattr_done(void *data, Eio_File *handler, double xattr_double)
    Emotion_Object_Data *sd = data;
 
    emotion_object_position_set(evas_object_smart_parent_get(sd->obj), xattr_double);
-   efl_event_callback_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL);
+   efl_event_callback_legacy_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL);
    _eio_load_xattr_cleanup(sd, handler);
 }
 
@@ -1319,7 +1319,7 @@ _eio_load_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED)
 {
    Emotion_Object_Data *sd = data;
 
-   efl_event_callback_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL);
+   efl_event_callback_legacy_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL);
    _eio_load_xattr_cleanup(sd, handler);
 }
 #endif
@@ -1354,10 +1354,10 @@ emotion_object_last_position_load(Evas_Object *obj)
    if (eina_xattr_double_get(tmp, "user.e.time_seek", &xattr))
      {
         emotion_object_position_set(obj, xattr);
-        efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL);
+        efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL);
      }
    else
-     efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL);
+     efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL);
 #endif
 }
 
@@ -1380,7 +1380,7 @@ _eio_save_xattr_done(void *data, Eio_File *handler)
 {
    Emotion_Object_Data *sd = data;
 
-   efl_event_callback_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL);
+   efl_event_callback_legacy_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL);
    _eio_save_xattr_cleanup(sd, handler);
 }
 
@@ -1389,7 +1389,7 @@ _eio_save_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED)
 {
    Emotion_Object_Data *sd = data;
 
-   efl_event_callback_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL);
+   efl_event_callback_legacy_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL);
    _eio_save_xattr_cleanup(sd, handler);
 }
 #endif
@@ -1419,9 +1419,9 @@ emotion_object_last_position_save(Evas_Object *obj)
                                               sd);
 #else
    if (eina_xattr_double_set(tmp, "user.e.time_seek", emotion_object_position_get(obj), 0))
-     efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL);
+     efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL);
    else
-     efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL);
+     efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL);
 
 #endif
 }
@@ -1483,7 +1483,7 @@ _emotion_frame_anim(void *data)
    _emotion_video_pos_update(obj,
                              emotion_engine_instance_pos_get(sd->engine_instance),
                              emotion_engine_instance_len_get(sd->engine_instance));
-   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL);
+   efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL);
    return EINA_FALSE;
 }
 
@@ -1507,8 +1507,8 @@ _emotion_video_pos_update(Evas_Object *obj, double pos, double len)
    if (len != sd->len) nlen = 1;
    sd->pos = pos;
    sd->len = len;
-   if (npos) efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_UPDATE, NULL);
-   if (nlen) efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_LENGTH_CHANGE, NULL);
+   if (npos) efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_POSITION_UPDATE, NULL);
+   if (nlen) efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_LENGTH_CHANGE, NULL);
 }
 
 EAPI void
@@ -1537,7 +1537,7 @@ _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio)
    if (changed)
      {
         evas_object_size_hint_request_set(obj, w, h);
-        efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_FRAME_RESIZE, NULL);
+        efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_FRAME_RESIZE, NULL);
         evas_object_geometry_get(obj, NULL, NULL, &w, &h);
         _emotion_object_aspect_border_apply(obj, sd, w, h);
      }
@@ -1561,7 +1561,7 @@ _emotion_decode_stop(Evas_Object *obj)
    if (sd->play)
      {
         sd->play = 0;
-        efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_DECODE_STOP, NULL);
+        efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_DECODE_STOP, NULL);
      }
 }
 
@@ -1577,26 +1577,26 @@ _emotion_open_done(Evas_Object *obj)
      emotion_object_position_set(obj, sd->remember_jump);
    if (sd->remember_play != sd->play)
      emotion_object_play_set(obj, sd->remember_play);
-   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_OPEN_DONE, NULL);
+   efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_OPEN_DONE, NULL);
 
 }
 
 EAPI void
 _emotion_playback_started(Evas_Object *obj)
 {
-   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, NULL);
+   efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, NULL);
 }
 
 EAPI void
 _emotion_playback_finished(Evas_Object *obj)
 {
-   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, NULL);
+   efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, NULL);
 }
 
 EAPI void
 _emotion_audio_level_change(Evas_Object *obj)
 {
-   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_AUDIO_LEVEL_CHANGE, NULL);
+   efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_AUDIO_LEVEL_CHANGE, NULL);
 }
 
 EAPI void
@@ -1605,7 +1605,7 @@ _emotion_channels_change(Evas_Object *obj)
    Emotion_Object_Data *sd;
 
    E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
-   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_CHANNELS_CHANGE, NULL);
+   efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_CHANNELS_CHANGE, NULL);
 }
 
 EAPI void
@@ -1615,7 +1615,7 @@ _emotion_title_set(Evas_Object *obj, char *title)
 
    E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
    eina_stringshare_replace(&sd->title, title);
-   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_TITLE_CHANGE, NULL);
+   efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_TITLE_CHANGE, NULL);
 
 }
 
@@ -1627,7 +1627,7 @@ _emotion_progress_set(Evas_Object *obj, char *info, double st)
    E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
    eina_stringshare_replace(&sd->progress.info, info);
    sd->progress.stat = st;
-   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, NULL);
+   efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, NULL);
 }
 
 EAPI void
@@ -1638,7 +1638,7 @@ _emotion_file_ref_set(Evas_Object *obj, const char *file, int num)
    E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
    eina_stringshare_replace(&sd->ref.file, file);
    sd->ref.num = num;
-   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_REF_CHANGE, NULL);
+   efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_REF_CHANGE, NULL);
 }
 
 EAPI void
@@ -1648,7 +1648,7 @@ _emotion_spu_button_num_set(Evas_Object *obj, int num)
 
    E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
    sd->spu.button_num = num;
-   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_BUTTON_NUM_CHANGE, NULL);
+   efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_BUTTON_NUM_CHANGE, NULL);
 }
 
 EAPI void
@@ -1658,7 +1658,7 @@ _emotion_spu_button_set(Evas_Object *obj, int button)
 
    E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
    sd->spu.button = button;
-   efl_event_callback_call(obj, EMOTION_OBJECT_EVENT_BUTTON_CHANGE, NULL);
+   efl_event_callback_legacy_call(obj, EMOTION_OBJECT_EVENT_BUTTON_CHANGE, NULL);
 }
 
 EAPI void
index ab03526..74355dd 100644 (file)
@@ -373,6 +373,22 @@ abstract Efl.Object ()
                          $true otherwise
                        ]]
       }
+      event_callback_legacy_call {
+         [[Call the callbacks for an event of an object.
+
+           Like @.event_callback_call, but also call legacy smart callbacks
+           that have the same name of the given event.
+
+           @since 1.19
+         ]]
+         params {
+            @in desc: ref(const(Efl.Event.Description)); [[The description of the event to call]]
+            @in event_info: void_ptr; [[Extra event info to pass to the callbacks]]
+         }
+         return: bool; [[$false if one of the callbacks aborted the call,
+                         $true otherwise
+                       ]]
+      }
       event_callback_stop {
          [[Stop the current callback call.
 
index b68a96d..732d063 100644 (file)
@@ -1075,10 +1075,10 @@ _efl_object_event_callback_array_del(Eo *obj, Efl_Object_Data *pd,
 }
 
 static Eina_Bool
-_cb_desc_match(const Efl_Event_Description *a, const Efl_Event_Description *b)
+_cb_desc_match(const Efl_Event_Description *a, const Efl_Event_Description *b, Eina_Bool legacy_compare)
 {
    /* If one is legacy and the other is not, strcmp. Else, pointer compare. */
-   if (EINA_UNLIKELY(_legacy_event_desc_is(a) != _legacy_event_desc_is(b)))
+   if (EINA_UNLIKELY(legacy_compare && (_legacy_event_desc_is(a) != _legacy_event_desc_is(b))))
      {
         return !strcmp(a->name, b->name);
      }
@@ -1086,10 +1086,11 @@ _cb_desc_match(const Efl_Event_Description *a, const Efl_Event_Description *b)
    return (a == b);
 }
 
-EOLIAN static Eina_Bool
-_efl_object_event_callback_call(Eo *obj_id, Efl_Object_Data *pd,
+static inline Eina_Bool
+_event_callback_call(Eo *obj_id, Efl_Object_Data *pd,
             const Efl_Event_Description *desc,
-            void *event_info)
+            void *event_info,
+            Eina_Bool legacy_compare)
 {
    Eina_Bool callback_already_stopped = pd->callback_stopped;
    Eina_Bool ret = EINA_TRUE;
@@ -1142,7 +1143,7 @@ _efl_object_event_callback_call(Eo *obj_id, Efl_Object_Data *pd,
 
                   for (it = cb->items.item_array; it->func; it++)
                     {
-                       if (!_cb_desc_match(it->desc, desc))
+                       if (!_cb_desc_match(it->desc, desc, legacy_compare))
                           continue;
                        if (!it->desc->unfreezable &&
                            (event_freeze_count || pd->event_freeze_count))
@@ -1165,7 +1166,7 @@ _efl_object_event_callback_call(Eo *obj_id, Efl_Object_Data *pd,
                }
              else
                {
-                  if (!_cb_desc_match(cb->items.item.desc, desc))
+                  if (!_cb_desc_match(cb->items.item.desc, desc, legacy_compare))
                     continue;
                   if (!cb->items.item.desc->unfreezable &&
                       (event_freeze_count || pd->event_freeze_count))
@@ -1204,6 +1205,22 @@ end:
    return ret;
 }
 
+EOLIAN static Eina_Bool
+_efl_object_event_callback_call(Eo *obj_id, Efl_Object_Data *pd,
+            const Efl_Event_Description *desc,
+            void *event_info)
+{
+   return _event_callback_call(obj_id, pd, desc, event_info, EINA_FALSE);
+}
+
+EOLIAN static Eina_Bool
+_efl_object_event_callback_legacy_call(Eo *obj_id, Efl_Object_Data *pd,
+            const Efl_Event_Description *desc,
+            void *event_info)
+{
+   return _event_callback_call(obj_id, pd, desc, event_info, EINA_TRUE);
+}
+
 EOLIAN static void
 _efl_object_event_callback_stop(Eo *obj EINA_UNUSED, Efl_Object_Data *pd)
 {
index e1ccac7..b1cc71d 100644 (file)
@@ -290,7 +290,7 @@ evas_event_callback_cleanup(Evas *eo_e)
 void
 evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info)
 {
-   efl_event_callback_call(eo_e, _legacy_evas_callback_table(type), event_info);
+   efl_event_callback_legacy_call(eo_e, _legacy_evas_callback_table(type), event_info);
 }
 
 void
@@ -342,7 +342,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
         efl_event_desc = _legacy_evas_callback_table(type);
      }
 
-   efl_event_callback_call(eo_obj, efl_event_desc, event_info);
+   efl_event_callback_legacy_call(eo_obj, efl_event_desc, event_info);
 
    if ((type == EVAS_CALLBACK_MOUSE_DOWN) || (type == EVAS_CALLBACK_MOUSE_UP))
      efl_input_pointer_button_flags_set(event_info, flags);
@@ -589,7 +589,7 @@ _animator_repeater(void *data, const Eo_Event *event)
 {
    Evas_Object_Protected_Data *obj = data;
 
-   efl_event_callback_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info);
+   efl_event_callback_legacy_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info);
    DBG("Emitting animator tick on %p.", obj->object);
 }
 
index 4454571..b6439fc 100644 (file)
@@ -70,7 +70,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
           {
              pd = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
              if (box_intersection_box(&pd_target->aabb, &pd->aabb))
-               ret = efl_event_callback_call(target_node, eo_desc, n);
+               ret = efl_event_callback_legacy_call(target_node, eo_desc, n);
           }
         if (!ret)
           {
@@ -86,7 +86,7 @@ _evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Eo_Ev
 {
    Eina_Bool ret = EINA_FALSE;
    const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get("clicked");
-   ret = efl_event_callback_call((Eo *)event->info, eo_desc, event->info);
+   ret = efl_event_callback_legacy_call((Eo *)event->info, eo_desc, event->info);
 
    if (!ret)
       efl_event_callback_stop(event->object);
@@ -514,7 +514,7 @@ node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
 
    evas_build_sphere(&pd->aabb, &pd->bsphere);
    eo_desc = efl_object_legacy_only_event_description_get("collision,private");
-   efl_event_callback_call(node, eo_desc, (void *)node);
+   efl_event_callback_legacy_call(node, eo_desc, (void *)node);
 
    return EINA_TRUE;
 }
index f172188..6b2b4ee 100644 (file)
@@ -687,7 +687,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
 
                             /*Calling callback clicked*/
                             eo_desc = efl_object_legacy_only_event_description_get("clicked,private");
-                            efl_event_callback_call(picked_node, eo_desc, picked_node);
+                            efl_event_callback_legacy_call(picked_node, eo_desc, picked_node);
 
                             return EINA_TRUE;
                          }
@@ -726,7 +726,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
 
    /*Calling callback clicked*/
    eo_desc = efl_object_legacy_only_event_description_get("clicked,private");
-   efl_event_callback_call(data.node, eo_desc, data.node);
+   efl_event_callback_legacy_call(data.node, eo_desc, data.node);
 
    return EINA_TRUE;
 }
index e8d4dce..bb69385 100644 (file)
@@ -214,7 +214,7 @@ _evas_box_internal_append(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child)
 
    priv->children = eina_list_append(priv->children, opt);
    priv->children_changed = EINA_TRUE;
-   efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt);
+   efl_event_callback_legacy_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt);
 
    return opt;
 }
@@ -230,7 +230,7 @@ _evas_box_internal_prepend(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child
 
    priv->children = eina_list_prepend(priv->children, opt);
    priv->children_changed = EINA_TRUE;
-   efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt);
+   efl_event_callback_legacy_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt);
 
    return opt;
 }
@@ -254,7 +254,7 @@ _evas_box_internal_insert_before(Eo *o, Evas_Object_Box_Data *priv, Evas_Object
              priv->children = eina_list_prepend_relative
                 (priv->children, new_opt, opt);
              priv->children_changed = EINA_TRUE;
-             efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
+             efl_event_callback_legacy_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
              return new_opt;
           }
      }
@@ -281,7 +281,7 @@ _evas_box_internal_insert_after(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *
              priv->children = eina_list_append_relative
                 (priv->children, new_opt, opt);
              priv->children_changed = EINA_TRUE;
-             efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
+             efl_event_callback_legacy_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
              return new_opt;
           }
      }
@@ -304,7 +304,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi
 
         priv->children = eina_list_prepend(priv->children, new_opt);
         priv->children_changed = EINA_TRUE;
-        efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
+        efl_event_callback_legacy_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
         return new_opt;
      }
 
@@ -323,7 +323,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi
              priv->children = eina_list_prepend_relative
                 (priv->children, new_opt, opt);
              priv->children_changed = EINA_TRUE;
-             efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
+             efl_event_callback_legacy_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
              return new_opt;
           }
      }
@@ -345,7 +345,7 @@ _evas_box_internal_remove(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child)
              priv->children = eina_list_remove(priv->children, opt);
              evas_obj_box_internal_option_free(o, opt);
              priv->children_changed = EINA_TRUE;
-             efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj);
+             efl_event_callback_legacy_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj);
 
              return obj;
           }
@@ -373,7 +373,7 @@ _evas_box_internal_remove_at(Eo *o, Evas_Object_Box_Data *priv, unsigned int pos
    priv->children = eina_list_remove_list(priv->children, node);
    evas_obj_box_internal_option_free(o, opt);
    priv->children_changed = EINA_TRUE;
-   efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj);
+   efl_event_callback_legacy_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj);
    return obj;
 }
 
index b3d6acb..1efa864 100644 (file)
@@ -833,7 +833,7 @@ evas_object_smart_callback_call(Evas_Object *eo_obj, const char *event, void *ev
 
    if (!event) return;
    const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event);
-   efl_event_callback_call(eo_obj, eo_desc, event_info);
+   efl_event_callback_legacy_call(eo_obj, eo_desc, event_info);
 }
 
 EAPI Eina_Bool
index 10cfbd1..330e324 100644 (file)
@@ -7027,7 +7027,7 @@ _cursor_emit_if_changed(Efl_Canvas_Text_Cursor *cur_obj)
    if (cur->changed)
      {
         cur->changed = EINA_FALSE;
-        efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+        efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
      }
 }
 
@@ -7100,11 +7100,11 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
         EINA_LIST_FOREACH(o->cursors, l, data)
           {
              efl_event_thaw(data);
-             efl_event_callback_call(data, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+             efl_event_callback_legacy_call(data, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
           }
      }
    efl_event_thaw(o->cursor);
-   efl_event_callback_call(o->cursor, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(o->cursor, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 
     o->markup_text = text;
 }
@@ -8301,7 +8301,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_paragraph_first(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _canvas_text_cursor_paragraph_first(cur);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 
@@ -8332,7 +8332,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_paragraph_last(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _canvas_text_cursor_paragraph_last(cur);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static Eina_Bool
@@ -8371,7 +8371,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_paragraph_next(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_paragraph_next(cur);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static Eina_Bool
@@ -8414,7 +8414,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_paragraph_prev(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_paragraph_prev(cur);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 EAPI void
@@ -8571,7 +8571,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_word_start(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur EINA_UNUSED)
 {
    evas_textblock_cursor_word_start(cur_obj);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 EAPI Eina_Bool
@@ -8633,7 +8633,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_word_end(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur EINA_UNUSED)
 {
    evas_textblock_cursor_word_end(cur_obj);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static Eina_Bool
@@ -8688,7 +8688,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_char_next(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_char_next(cur);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static Eina_Bool
@@ -8718,7 +8718,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_char_prev(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_char_prev(cur);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -8734,7 +8734,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_paragraph_char_first(cur);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -8762,7 +8762,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_paragraph_char_last(cur);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -8811,7 +8811,7 @@ _efl_canvas_text_cursor_line_char_first(Evas_Textblock_Cursor *cur_obj, Efl_Canv
    if (!ln) return;
 
    _cursor_line_first_char_get(ln, cur, o);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -8866,7 +8866,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_line_char_last(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_line_char_last(cur);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 /**
@@ -9377,7 +9377,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_position_set(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur, int _pos)
 {
    _evas_textblock_cursor_pos_set(cur, _pos);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 EAPI Eina_Bool
@@ -9447,7 +9447,7 @@ _efl_canvas_text_cursor_line_jump_by(Eo *c, Efl_Canvas_Text_Cursor_Data *pd EINA
           evas_textblock_cursor_line_char_last(c);
      }
 
-   efl_event_callback_call(c, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(c, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 static int
@@ -9529,7 +9529,7 @@ _efl_canvas_text_cursor_copy(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur,
    if (!efl_canvas_text_cursor_equal(cur_obj, src_obj))
      {
         _evas_textblock_cursor_copy(cur, src);
-        efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+        efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
      }
 }
 
@@ -9909,7 +9909,7 @@ _efl_canvas_text_cursor_text_insert(Eo *cur_obj,
       Efl_Canvas_Text_Cursor_Data *cur, const char *_text)
 {
    int len = _efl_canvas_text_cursor_text_append(cur, _text);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
    return len;
 }
 
@@ -10336,7 +10336,7 @@ EOLIAN static void
 _efl_canvas_text_cursor_char_delete(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
 {
    _evas_textblock_cursor_char_delete(cur);
-   efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
 }
 
 EAPI void
@@ -11533,7 +11533,7 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur_obj,  Evas_Coord
 end:
    if (ret)
      {
-        efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
+        efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
      }
    return ret;
 }
@@ -13966,7 +13966,7 @@ _efl_canvas_text_cursor_object_item_insert(Eo *cur_obj EINA_UNUSED,
    Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
    Efl_Canvas_Text_Annotation *ret =
       _textblock_annotation_insert(cur->obj, o, cur, cur, format, EINA_TRUE);
-   efl_event_callback_call(cur->obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL);
+   efl_event_callback_legacy_call(cur->obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL);
    return ret;
 }
 
index 0111adb..d0db81e 100644 (file)
@@ -26,7 +26,7 @@ _efl_vg_property_changed(void *data, const Eo_Event *event)
    if (!pd->flags) pd->flags = EFL_GFX_CHANGE_FLAG_ALL;
 
    parent = efl_parent_get(event->object);
-   efl_event_callback_call(parent, event->desc, event->info);
+   efl_event_callback_legacy_call(parent, event->desc, event->info);
 }
 
 static void
index 8d85915..6a6b3c5 100644 (file)
@@ -85,7 +85,7 @@ _evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m)
 static inline void
 _efl_vg_changed(Eo *obj)
 {
-   efl_event_callback_call(obj, EFL_GFX_CHANGED, NULL);
+   efl_event_callback_legacy_call(obj, EFL_GFX_CHANGED, NULL);
 }
 
 static inline void *
index f994e4d..d4fcab3 100644 (file)
@@ -280,7 +280,7 @@ evas_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
 
    evas_object_image_size_get(ev->evas_obj, &w, &h);
    _emotion_frame_resize(ev->obj, w, h, w / (double) h);
-   efl_event_callback_call(ev->obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL);
+   efl_event_callback_legacy_call(ev->obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL);
 }
 
 /* Fetch all libvlc tracks. */
index 2328120..52bafcf 100644 (file)
@@ -27,7 +27,7 @@ _a_set(Eo *obj, void *class_data, int a)
    pd->protected.protected_x1 = a + 1;
    pd->protected.public.public_x2 = a + 2;
 
-   efl_event_callback_call(obj, EV_A_CHANGED, &pd->a);
+   efl_event_callback_legacy_call(obj, EV_A_CHANGED, &pd->a);
 }
 
 EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
index 41f5f1a..ea627dd 100644 (file)
@@ -17,7 +17,7 @@ _a_set(Eo *obj, void *class_data, int a)
    printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
    pd->a = a;
 
-   efl_event_callback_call(obj, EV_A_CHANGED, &pd->a);
+   efl_event_callback_legacy_call(obj, EV_A_CHANGED, &pd->a);
 }
 
 static int
index 84de464..498f3c1 100644 (file)
@@ -49,7 +49,7 @@ _restart_2_cb(void *data, const Eo_Event *event)
    fail_if(inside);
 
    inside = EINA_TRUE;
-   efl_event_callback_call(event->object, event->desc, data);
+   efl_event_callback_legacy_call(event->object, event->desc, data);
    inside = EINA_FALSE;
 
    called++;
@@ -199,7 +199,7 @@ main(int argc, char *argv[])
 
    efl_event_callback_priority_add(obj, EV_RESTART, EFL_CALLBACK_PRIORITY_DEFAULT, _restart_1_cb, NULL);
    efl_event_callback_priority_add(obj, EV_RESTART, EFL_CALLBACK_PRIORITY_BEFORE, _restart_2_cb, NULL);
-   efl_event_callback_call(obj, EV_RESTART, NULL);
+   efl_event_callback_legacy_call(obj, EV_RESTART, NULL);
    fail_if(inside);
    fail_if(called != 2);
 
index e8c0ba2..5404f4d 100644 (file)
@@ -25,7 +25,7 @@ _a_set(Eo *obj, void *class_data, int a)
    pd->a = a;
    printf("%s %d\n", __func__, pd->a);
 
-   efl_event_callback_call(obj, EV_A_CHANGED, &pd->a);
+   efl_event_callback_legacy_call(obj, EV_A_CHANGED, &pd->a);
 }
 
 void
index a68d643..6bbeda5 100644 (file)
@@ -20,7 +20,7 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
    printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
    pd->a = a;
 
-   efl_event_callback_call(obj, EV_A_CHANGED, &pd->a);
+   efl_event_callback_legacy_call(obj, EV_A_CHANGED, &pd->a);
 }
 
 static int
index fd16ddb..d6ab99e 100644 (file)
@@ -139,7 +139,7 @@ static void
 _eo_signals_a_changed_within_cb(void *_data EINA_UNUSED, const Eo_Event *event)
 {
    int a = 3;
-   efl_event_callback_call(event->object, EV_A_CHANGED, &a);
+   efl_event_callback_legacy_call(event->object, EV_A_CHANGED, &a);
    _eo_signals_cb_flag = 0x8;
 }
 
@@ -242,13 +242,13 @@ START_TEST(eo_signals)
         int a = 3;
         _eo_signals_cb_current = 0;
         _eo_signals_cb_flag = 0;
-        efl_event_callback_call(obj, a_desc, &a);
+        efl_event_callback_legacy_call(obj, a_desc, &a);
         ck_assert_int_eq(_eo_signals_cb_flag, 0x3);
 
         /* Stop event within event. */
         _eo_signals_cb_current = 0;
         _eo_signals_cb_flag = 0;
-        fail_if(!efl_event_callback_call(obj, EV_A_CHANGED2, &a));
+        fail_if(!efl_event_callback_legacy_call(obj, EV_A_CHANGED2, &a));
         ck_assert_int_eq(_eo_signals_cb_flag, 0x8);
         fail_if(!r);
      }
index d7483b3..8dcf5b6 100644 (file)
@@ -100,23 +100,23 @@ static void _generic_out_optional_ctor_b(Eo *obj EINA_UNUSED, Generic_Data* pd,
 
 static void _generic_call_event1(Eo *obj, Generic_Data* pd EINA_UNUSED)
 {
-  efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT1, NULL);
+  efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT1, NULL);
 }
 static void _generic_call_event2(Eo *obj, Generic_Data* pd EINA_UNUSED)
 {
-  efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT2, obj);
+  efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT2, obj);
 }
 static void _generic_call_event3(Eo *obj, Generic_Data* pd EINA_UNUSED)
 {
   int p = 42;
-  efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT3, &p);
+  efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT3, &p);
 }
 static void _generic_call_event4(Eo *obj, Generic_Data* pd EINA_UNUSED)
 {
   int i = 42;
   Eina_List* p = eina_list_append(NULL, &i);
   ck_assert(p != NULL);
-  efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT4, p);
+  efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT4, p);
   eina_list_free(p);
 }
 static 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)
   Eina_List* p = eina_list_append(NULL, &i);
 
   Generic_Event e = {.field1 = 42, .field2 = p};
-  efl_event_callback_call(obj, GENERIC_EVENT_PREFIX_EVENT5, &e);
+  efl_event_callback_legacy_call(obj, GENERIC_EVENT_PREFIX_EVENT5, &e);
   eina_list_free(p);
 }
 static void _generic_protected_method1(Eo *obj EINA_UNUSED, Generic_Data* pd EINA_UNUSED)
index af4acbf..63a4a7a 100644 (file)
@@ -191,9 +191,9 @@ _test_object_event_emit(Eo* obj, Test_Object_Data *pd EINA_UNUSED)
    fprintf(stdout, "_test_object_event_emit()\n");
    fflush(stdout);
    static Test_Struct_Ex s = {42, TEST_ENUM_EX_THIRD};
-   efl_event_callback_call(obj, TEST_OBJECT_EVENT_TEST, NULL);
-   efl_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRUCTARG, &s);
-   efl_event_callback_call(obj, TEST_OBJECT_EVENT_TEST_STRINGARG, "foo");
+   efl_event_callback_legacy_call(obj, TEST_OBJECT_EVENT_TEST, NULL);
+   efl_event_callback_legacy_call(obj, TEST_OBJECT_EVENT_TEST_STRUCTARG, &s);
+   efl_event_callback_legacy_call(obj, TEST_OBJECT_EVENT_TEST_STRINGARG, "foo");
 }
 
 EOLIAN static char *