eolian-cxx: Fix C++ events with new Eo_Event_Cb signature

2 files changed, 6 insertions, 8 deletions

diff --git a/src/bindings/eo_cxx/eo_cxx_interop.hh b/src/bindings/eo_cxx/eo_cxx_interop.hh
index e0fd2ed355..7cd7b3577b 100644
--- a/src/bindings/eo_cxx/eo_cxx_interop.hh
+++ b/src/bindings/eo_cxx/eo_cxx_interop.hh
@@ -438,11 +438,9 @@ C get_callback()
 }
 
 template <typename F>
-Eina_Bool free_callback_calback(void* data, Eo* obj EINA_UNUSED
-                                , Eo_Event_Description const* e EINA_UNUSED
-                                , void* event_info EINA_UNUSED)
+Eina_Bool free_callback_callback(void* data, ::Eo_Event2 const*)
 {
-   delete (F*) data;
+   delete static_cast<F*>(data);
    return EO_CALLBACK_CONTINUE;
 }
 
diff --git a/src/bindings/eo_cxx/eo_event.hh b/src/bindings/eo_cxx/eo_event.hh
index 965a2c6697..d0b335e0e5 100644
--- a/src/bindings/eo_cxx/eo_event.hh
+++ b/src/bindings/eo_cxx/eo_event.hh
@@ -137,12 +137,12 @@ Eina_Bool really_call_event(T& wrapper, F& f, Eo_Event_Description const& desc,
 
 template <typename T, typename F>
 Eina_Bool
-event_callback(void *data, Eo *obj, Eo_Event_Description const* desc, void *info)
+event_callback(void *data, ::Eo_Event2 const* event)
 {
-   T wrapper(::eo_ref(obj));
+   T wrapper(::eo_ref(event->obj));
    F *f = static_cast<F*>(data);
-   return _detail::really_call_event(wrapper, *f, *desc, info
-                                     , std::is_void<decltype((*f)(wrapper, *desc, info))>());
+   return _detail::really_call_event(wrapper, *f, *event->desc, event->event_info
+                                     , std::is_void<decltype((*f)(wrapper, *event->desc, event->event_info))>());
 }
 
 }