yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=5e94eeefd127e8a25b3b672eeb2537d3aad7a9ff

commit 5e94eeefd127e8a25b3b672eeb2537d3aad7a9ff
Author: Yakov Goldberg <yako...@samsung.com>
Date:   Tue Mar 1 14:02:54 2016 +0200

    Adapt Erigo to new Eo callbacks signatures
---
 src/bin/gui/cbview.c        |  22 +++---
 src/bin/gui/contentview.c   |  16 ++---
 src/bin/gui/contentview.h   |   6 +-
 src/bin/gui/descview.c      |   6 +-
 src/bin/gui/dnd.c           |   8 ++-
 src/bin/gui/editor.c        | 160 ++++++++++++++++++++++++--------------------
 src/bin/gui/egui_logic.c    |   4 +-
 src/bin/gui/itemview.c      |   4 +-
 src/bin/gui/itemview.h      |   4 +-
 src/bin/gui/popup.c         |   3 +-
 src/bin/gui/prop_layout.c   |   3 +-
 src/bin/gui/props_helper.c  |   6 +-
 src/bin/gui/propview.c      |  17 +++--
 src/bin/gui/propview.h      |   4 +-
 src/bin/gui/rmview.c        |  18 +++--
 src/bin/gui/settings_view.c |   3 +-
 src/lib/generator.c         |   2 +-
 src/lib/gui_widget.c        |   3 +-
 src/lib/simulator.c         |   7 +-
 19 files changed, 166 insertions(+), 130 deletions(-)

diff --git a/src/bin/gui/cbview.c b/src/bin/gui/cbview.c
index e5961b5..528c0e9 100644
--- a/src/bin/gui/cbview.c
+++ b/src/bin/gui/cbview.c
@@ -43,12 +43,13 @@ cbview_item_selected_set(Eid *cb_eid)
 }
 
 static Eina_Bool
-_action_type_changed(void *data, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *event EINA_UNUSED, void *event_info)
+_action_type_changed(void *data, const Eo_Event *event)
 {
    It_Data *it_data = data;
    Gui_Widget_Callback *cb = it_data->cb;
    Gui_Widget *wdg = (Gui_Widget *) it_data->wdg;
    Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
+   void *event_info = event->event_info;
 
    Eid *action_id = cb_action_id_get(cb);
    Gui_Action *new_action;
@@ -136,12 +137,13 @@ _action_wdg_selected(void *data, Eo *obj EINA_UNUSED, 
void *event_info)
 }
 
 static Eina_Bool
-_action_parent_selected(void *data, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info)
+_action_parent_selected(void *data, const Eo_Event *event)
 {
    It_Data *it_data = data;
    Gui_Widget_Callback *cb = it_data->cb;
    Gui_Widget *wdg = (Gui_Widget *) it_data->wdg;
    Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
+   void *event_info = event->event_info;
 
    Eid *action_id = cb_action_id_get(cb);
    Gui_Action *action = action_get(action_id);
@@ -164,7 +166,7 @@ _action_parent_selected(void *data, Eo *obj EINA_UNUSED, 
const Eo_Event_Descript
 }
 
 static Eina_Bool
-_action_user_cb_selected(void *data, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info)
+_action_user_cb_selected(void *data, const Eo_Event *event)
 {
    It_Data *it_data = data;
    Gui_Widget_Callback *cb = it_data->cb;
@@ -180,7 +182,7 @@ _action_user_cb_selected(void *data, Eo *obj EINA_UNUSED, 
const Eo_Event_Descrip
         memento_focused_widget_add(wdg_eid_get(wdg));
         action_set(action_id, new_action);
 
-        const char *cb_name = elm_object_item_part_text_get(event_info, NULL);
+        const char *cb_name = elm_object_item_part_text_get(event->event_info, 
NULL);
         Eid *cb_id = gui_context_eid_get_by_name(ctx, cb_name);
         action_user_set(new_action, cb_id, NULL);
         context_memento_finalize(ctx);
@@ -192,7 +194,7 @@ _action_user_cb_selected(void *data, Eo *obj EINA_UNUSED, 
const Eo_Event_Descrip
 }
 
 static Eina_Bool
-_action_prop_selected(void *data, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info)
+_action_prop_selected(void *data, const Eo_Event *event)
 {
    It_Data *it_data = data;
    Gui_Widget_Callback *cb = it_data->cb;
@@ -201,7 +203,7 @@ _action_prop_selected(void *data, Eo *obj EINA_UNUSED, 
const Eo_Event_Descriptio
    Gui_Action *action = action_get(action_id);
    if (action)
      {
-        const char *prop_name = elm_object_item_part_text_get(event_info, 
NULL);
+        const char *prop_name = 
elm_object_item_part_text_get(event->event_info, NULL);
         char prop_namespace[PATH_MAX] = {'\0'};
         unsigned int elements_count = 0;
         char **_split_ret = NULL;
@@ -245,7 +247,7 @@ _action_prop_selected(void *data, Eo *obj EINA_UNUSED, 
const Eo_Event_Descriptio
 }
 
 static Eina_Bool
-_action_item_selected(void *data, Eo *obj, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info)
+_action_item_selected(void *data, const Eo_Event *event)
 {
    It_Data *it_data = data;
    Gui_Widget_Callback *cb = it_data->cb;
@@ -265,9 +267,9 @@ _action_item_selected(void *data, Eo *obj, const 
Eo_Event_Description *desc EINA
    /* Get value which need to be changed.*/
    Gui_Value *val = prop_value_nth_get(new_prop, 0);
 
-   const char *new_item_name = elm_object_item_part_text_get(event_info, NULL);
+   const char *new_item_name = 
elm_object_item_part_text_get(event->event_info, NULL);
    /* Set selected string on hover */
-   elm_object_text_set(obj, new_item_name);
+   elm_object_text_set(event->obj, new_item_name);
    Eid *new_name_id = gui_context_eid_get_by_name(ctx, new_item_name);
    gui_value_name_id_set(val, GUI_TYPE_OBJECT_ITEM, new_name_id);
 
@@ -487,7 +489,7 @@ _item_del(void *data, Evas_Object *obj EINA_UNUSED)
 }
 
 static Eina_Bool
-_wdgs_struct_free(void *wdgs, Eo *obj EINA_UNUSED, const Eo_Event_Description2 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_wdgs_struct_free(void *wdgs, const Eo_Event *event EINA_UNUSED)
 {
    free(wdgs);
    return EINA_TRUE;
diff --git a/src/bin/gui/contentview.c b/src/bin/gui/contentview.c
index 6f8ab84..bae292d 100644
--- a/src/bin/gui/contentview.c
+++ b/src/bin/gui/contentview.c
@@ -24,7 +24,7 @@ contentview_cbs_get()
 }
 
 static Eina_Bool
-_pfd_free_cb(void *pfd, Eo *obj EINA_UNUSED, const Eo_Event_Description2 *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_pfd_free_cb(void *pfd, const Eo_Event *event EINA_UNUSED)
 {
    free(pfd);
    return EINA_TRUE;
@@ -162,7 +162,7 @@ _content_select_item(const Gui_Widget_Property *prop)
 }
 
 Eina_Bool
-_contentview_del_btn_clicked(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc, void *event_info)
+_contentview_del_btn_clicked(void *data EINA_UNUSED, const Eo_Event *event 
EINA_UNUSED)
 {
    const Gui_Widget_Property *prev_prop = NULL;
 
@@ -180,14 +180,14 @@ _contentview_del_btn_clicked(void *data EINA_UNUSED, Eo 
*obj, const Eo_Event_Des
         if (it_data) prev_prop = it_data->prop;
      }
 
-   Eina_Bool ret = _contentview_cbs->content_delete_cb_func((void *)idx, obj, 
desc, event_info);
+   _contentview_cbs->content_delete_cb_func(idx);
    if (prev_prop) _content_select_item(prev_prop);
 
-   return ret;
+   return EO_CALLBACK_CONTINUE;
 }
 
 Eina_Bool
-_contentview_up_btn_clicked(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc, void *event_info EINA_UNUSED)
+_contentview_up_btn_clicked(void *data EINA_UNUSED, const Eo_Event *event 
EINA_UNUSED)
 {
    Elm_Object_Item *glit = elm_genlist_selected_item_get(ctn_list);
    if (!glit) return EO_CALLBACK_CONTINUE;
@@ -196,14 +196,14 @@ _contentview_up_btn_clicked(void *data EINA_UNUSED, Eo 
*obj, const Eo_Event_Desc
    const Gui_Widget_Property *prev_prop = it_data->prop;
    intptr_t idx = it_data->idx;
 
-   Eina_Bool ret = _contentview_cbs->content_reorder_cb_func((void *)idx, obj, 
desc, (void *)(intptr_t)UP);
+   Eina_Bool ret = _contentview_cbs->content_reorder_cb_func(idx, UP);
    _content_select_item(prev_prop);
 
    return ret;
 }
 
 Eina_Bool
-_contentview_down_btn_clicked(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc, void *event_info EINA_UNUSED)
+_contentview_down_btn_clicked(void *data EINA_UNUSED, const Eo_Event *event 
EINA_UNUSED)
 {
     Elm_Object_Item *glit = elm_genlist_selected_item_get(ctn_list);
    if (!glit) return EO_CALLBACK_CONTINUE;
@@ -212,7 +212,7 @@ _contentview_down_btn_clicked(void *data EINA_UNUSED, Eo 
*obj, const Eo_Event_De
    const Gui_Widget_Property *prev_prop = it_data->prop;
    intptr_t idx = it_data->idx;
 
-   Eina_Bool ret = _contentview_cbs->content_reorder_cb_func((void *)idx, obj, 
desc, (void *)(intptr_t)DOWN);
+   Eina_Bool ret = _contentview_cbs->content_reorder_cb_func(idx, DOWN);
    _content_select_item(prev_prop);
 
    return ret;
diff --git a/src/bin/gui/contentview.h b/src/bin/gui/contentview.h
index 82cb343..98fce97 100644
--- a/src/bin/gui/contentview.h
+++ b/src/bin/gui/contentview.h
@@ -7,9 +7,9 @@
 
 typedef struct
 {
-   Eina_Bool (*content_delete_cb_func)(void *data, Eo *obj, const 
Eo_Event_Description *desc, void *event_info);
-   Eina_Bool (*content_reorder_cb_func)(void *data, Eo *obj, const 
Eo_Event_Description *desc, void *event_info);
-   Eina_Bool (*content_change_cb_func)(void *data, Eo *obj, const 
Eo_Event_Description *desc, void *event_info);
+   void (*content_delete_cb_func)(int idx);
+   Eina_Bool (*content_reorder_cb_func)(int idx, intptr_t button_dir);
+   Eina_Bool (*content_change_cb_func)(void *data, const Eo_Event *event);
 } ContentViewCbs;
 
 void
diff --git a/src/bin/gui/descview.c b/src/bin/gui/descview.c
index 6549ff3..562edf9 100644
--- a/src/bin/gui/descview.c
+++ b/src/bin/gui/descview.c
@@ -30,9 +30,10 @@ descview_build(const Gui_Widget *wdg)
 }
 
 static Eina_Bool
-_wdg_public_change_cb(void *data, Eo *obj, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_wdg_public_change_cb(void *data, const Eo_Event *event)
 {
    Gui_Widget *wdg = data;
+   Eo *obj = event->obj;
    Eina_Bool new_state, old_state;
    eo_do(obj, new_state = elm_obj_check_state_get());
    old_state = wdg_public_get(wdg);
@@ -46,9 +47,10 @@ _wdg_public_change_cb(void *data, Eo *obj, const 
Eo_Event_Description *desc EINA
 }
 
 static Eina_Bool
-_wdg_name_change_cb(void *data, Eo *obj, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_wdg_name_change_cb(void *data, const Eo_Event *event)
 {
    Gui_Widget *wdg = data;
+   Eo *obj = event->obj;
    const char *new_name = NULL;
    char *old_name = NULL;
    eo_do(obj, new_name = elm_obj_widget_part_text_get(NULL));
diff --git a/src/bin/gui/dnd.c b/src/bin/gui/dnd.c
index 57590db..6259efd 100644
--- a/src/bin/gui/dnd.c
+++ b/src/bin/gui/dnd.c
@@ -498,8 +498,9 @@ _drag_start_from_factory(void *data)
 }
 
 static Eina_Bool
-_factory_drag_mouse_up(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_factory_drag_mouse_up(void *data EINA_UNUSED, const Eo_Event *event)
 {
+   Eo *obj = event->obj;
    eo_do(obj, eo_event_callback_del(EVAS_OBJECT_EVENT_MOUSE_UP, 
_factory_drag_mouse_up, NULL));
    if (_drag_factory_timer)
      {
@@ -510,8 +511,9 @@ _factory_drag_mouse_up(void *data EINA_UNUSED, Eo *obj, 
const Eo_Event_Descripti
 }
 
 static Eina_Bool
-_factory_drag_mouse_down(void *data, Eo *obj, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_factory_drag_mouse_down(void *data, const Eo_Event *event)
 {
+   Eo *obj = event->obj;
    Factory_Drag_Info *fdi = data;
    eo_do(obj, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_UP, 
_factory_drag_mouse_up, NULL));
 
@@ -521,7 +523,7 @@ _factory_drag_mouse_down(void *data, Eo *obj, const 
Eo_Event_Description *desc E
 }
 
 static Eina_Bool
-_factory_drag_info_free(void *data, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_factory_drag_info_free(void *data, const Eo_Event *event EINA_UNUSED)
 {
    dnd_debug("In");
    Factory_Drag_Info *fdi = data;
diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index e6006c0..10b4910 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -80,11 +80,17 @@ _zoom_label_update(double zoom);
 static Gui_Context *_active_ctx = NULL;
 static const Egui_Layout_Widgets *g;
 
+static Eina_Bool
+_canvas_resize_cb_int(Eo *canvas);
+
 Eina_Bool
-_canvas_resize_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED);
+_canvas_resize_cb(void *data EINA_UNUSED, Eo_Event const *event)
+{
+   return _canvas_resize_cb_int(event->obj);
+}
 
 Eina_Bool
-_theme_selector_hover_selected_cb(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info);
+_theme_selector_hover_selected_cb(void *data EINA_UNUSED, const Eo_Event 
*event);
 
 /*Cut theme name for hoversel*/
 #define THEME_NAME_GET(_t) (strrchr(_t, '/') ? strrchr(_t, '/') : _t)
@@ -238,13 +244,13 @@ which_border(Evas_Coord x, Evas_Coord y, Evas_Coord ow, 
Evas_Coord oh)
 }
 
 static Eina_Bool
-_marker_mouse_down(void *data, Eo *obj, const Eo_Event_Description *desc, void 
*event_info);
+_marker_mouse_down(void *data, const Eo_Event *event);
 static Eina_Bool
-_marker_mouse_up(void *data, Eo *obj, const Eo_Event_Description *desc, void 
*event_info);
+_marker_mouse_up(void *data, const Eo_Event *event);
 static Eina_Bool
-_marker_mouse_in(void *data, Eo *obj, const Eo_Event_Description *desc, void 
*event_info);
+_marker_mouse_in(void *data, const Eo_Event *event);
 static Eina_Bool
-_marker_mouse_out(void *data, Eo *obj, const Eo_Event_Description *desc, void 
*event_info);
+_marker_mouse_out(void *data, const Eo_Event *event);
 
 enum
 {
@@ -581,10 +587,11 @@ _drag_widget_start(void *data)
 /* Callback, called on mouse_down on window image,
  * resolves widget under a cursor. */
 static Eina_Bool
-_mouse_down_main(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info)
+_mouse_down_main(void *data EINA_UNUSED, const Eo_Event *event)
 {
    drag_started = EINA_FALSE;
-   Evas_Event_Mouse_Down *ev = event_info;
+   Eo *obj = event->obj;
+   Evas_Event_Mouse_Down *ev = event->event_info;
    Gui_Widget *wdg_main = data, *drag_candidate = NULL, *wdg;
 
    /* Catch mouse down on resize marker. */
@@ -620,7 +627,7 @@ _mouse_down_main(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *de
 
 /* Callback, called when press mouse button */
 static Eina_Bool
-_mouse_up_main(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_mouse_up_main(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
 {
    /* Catch mouse up on resize marker. */
    if (_mmd.data != BORDER_OUT)
@@ -637,13 +644,14 @@ _mouse_up_main(void *data EINA_UNUSED, Eo *obj 
EINA_UNUSED, const Eo_Event_Descr
 }
 
 static Eina_Bool
-_marker_mouse_move(void *data, Eo *marker EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info)
+_marker_mouse_move(void *data, const Eo_Event *event)
 {
    Gui_Context *ctx = _active_context_get();
    double scale = gui_context_scale_get(ctx);
    Gui_Session *session = (Gui_Session *) gui_context_editor_session_get(ctx);
    Eo *weo;
    Evas_Coord ox, oy, ow, oh, minw, minh;
+   void *event_info = event->event_info;
    /* Pointer coords inside canvas: global canvas for windows,
     * local canvas(inlined img) for other objects. */
    //Evas_Coord canvas_ptr_x, canvas_ptr_y;
@@ -869,16 +877,16 @@ _marker_mouse_move(void *data, Eo *marker EINA_UNUSED, 
const Eo_Event_Descriptio
 }
 
 static Eina_Bool
-_marker_mouse_down(void *data, Eo *obj, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_marker_mouse_down(void *data, const Eo_Event *event)
 {
    const Gui_Widget *wdg = _editor_wdg_selected_get();
 
-   eo_do(obj, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_MOVE, 
_marker_mouse_move, data));
-   eo_do(obj, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_UP, 
_marker_mouse_up, data));
+   eo_do(event->obj, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_MOVE, 
_marker_mouse_move, data));
+   eo_do(event->obj, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_UP, 
_marker_mouse_up, data));
    /* If widget is packed into container, return. */
    if (wdg_parent_container_eid_get(wdg)) return EO_CALLBACK_CONTINUE;
 
-   Evas_Event_Mouse_Down *ev = event_info;
+   Evas_Event_Mouse_Down *ev = event->event_info;
    _mmd.down_x = ev->output.x;
    _mmd.down_y = ev->output.y;
    _mmd.delta_x = 0;
@@ -925,10 +933,10 @@ _marker_mouse_down(void *data, Eo *obj, const 
Eo_Event_Description *desc EINA_UN
 }
 
 static Eina_Bool
-_marker_mouse_up(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_marker_mouse_up(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   eo_do(obj, eo_event_callback_del(EVAS_OBJECT_EVENT_MOUSE_MOVE, 
_marker_mouse_move, data));
-   eo_do(obj, eo_event_callback_del(EVAS_OBJECT_EVENT_MOUSE_UP, 
_marker_mouse_up, data));
+   eo_do(event->obj, eo_event_callback_del(EVAS_OBJECT_EVENT_MOUSE_MOVE, 
_marker_mouse_move, data));
+   eo_do(event->obj, eo_event_callback_del(EVAS_OBJECT_EVENT_MOUSE_UP, 
_marker_mouse_up, data));
 
    const Gui_Widget *wdg = _editor_wdg_selected_get();
    /* If widget is packed into container, return. */
@@ -937,7 +945,7 @@ _marker_mouse_up(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *de
    /* For main widget update canvas size*/
    if (IS_MAIN(wdg))
      {
-        _canvas_resize_cb(NULL, g->main_win->canvas_scroller, NULL, NULL);
+        _canvas_resize_cb_int(g->main_win->canvas_scroller);
      }
 
    _mmd.down_x = 0;
@@ -953,12 +961,12 @@ _marker_mouse_up(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *de
 }
 
 static Eina_Bool
-_marker_mouse_in(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_marker_mouse_in(void *data, const Eo_Event *event)
 {
    _mmd.data = data;
 
    Evas_Coord sz = 17, trans_size = 25;
-   Evas_Event_Mouse_Down *ev = event_info;
+   Evas_Event_Mouse_Down *ev = event->event_info;
 
    const Gui_Session *session = 
gui_context_editor_session_get(_active_context_get());
 
@@ -1004,7 +1012,7 @@ _marker_mouse_in(void *data, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *de
 }
 
 static Eina_Bool
-_marker_mouse_out(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_marker_mouse_out(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
 {
    Eo *cur_logo = NULL;
    _mmd.data = BORDER_OUT;
@@ -1034,13 +1042,14 @@ _marker_mouse_out(void *data EINA_UNUSED, Eo *obj 
EINA_UNUSED, const Eo_Event_De
 }
 
 static Eina_Bool
-_frame_mouse_move(void *data EINA_UNUSED, Eo *fr, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_frame_mouse_move(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Evas_Coord ox, oy, ow, oh;
-   Evas_Event_Mouse_Move *ev = event_info;
+   Evas_Event_Mouse_Move *ev = event->event_info;
    Gui_Widget *wdg;
    Gui_Widget_Property *prop;
    double scale = gui_context_scale_get(_active_context_get());
+   Eo *fr = event->obj;
 
    elm_grid_pack_get(fr, &ox, &oy, &ow, &oh);
 
@@ -1072,9 +1081,11 @@ _frame_mouse_move(void *data EINA_UNUSED, Eo *fr, const 
Eo_Event_Description *de
 }
 
 static Eina_Bool
-_frame_mouse_down(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info)
+_frame_mouse_down(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Gui_Widget *wdg;
+   Gui_Widget *wdg = NULL;
+   Eo *obj = event->obj;
+
    drag_started = EINA_FALSE;
    eo_do(obj, wdg = eo_key_data_get("winwdg"));
 
@@ -1082,7 +1093,7 @@ _frame_mouse_down(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *d
 
    if (IS_MAIN(wdg))
      {
-        Evas_Event_Mouse_Down *ev = event_info;
+        Evas_Event_Mouse_Down *ev = event->event_info;
         Evas_Coord ox, oy, ow, oh;
         elm_grid_pack_get(obj, &ox, &oy, &ow, &oh);
 
@@ -1109,9 +1120,10 @@ _frame_mouse_down(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *d
 }
 
 static Eina_Bool
-_frame_mouse_up(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_frame_mouse_up(void *data EINA_UNUSED, const Eo_Event *event)
 {
    const Gui_Widget *wdg = _editor_wdg_selected_get();
+   Eo *obj = event->obj;
    /* Don't use dnd for dragging window around canvas. */
    if (IS_WIN(wdg))
      {
@@ -1129,10 +1141,11 @@ _frame_mouse_up(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *des
 }
 
 static Eina_Bool
-_wdg_resize(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_wdg_resize(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Evas_Coord ow = 0, oh = 0, minw = 0, minh = 0;
 
+   Eo *obj = event->obj;
    const Gui_Context *ctx = _active_context_get();
    Gui_Widget *wdg = wdg_find_by_eo(gui_context_editor_session_get(ctx), ctx, 
obj);
    Gui_Widget *selected_wdg = gui_context_data_get(ctx, SELECTED_WDG);
@@ -1207,11 +1220,12 @@ _has_part(const Gui_Widget *wdg, const char 
*new_part_name, Object_Container_Ite
 }
 
 static Eina_Bool
-_win_resize(void *data, Eo *o, const Eo_Event_Description *desc EINA_UNUSED, 
void *event_info EINA_UNUSED)
+_win_resize(void *data, const Eo_Event *event)
 {
    Evas_Coord ow = 0, oh = 0, minw = 0, minh = 0;
    Eo *fr = NULL;
    Gui_Widget *wdg = data;
+   Eo *o = event->obj;
 
    eo_do(o, evas_obj_size_hint_min_get(&minw, &minh));
    eo_do(o, efl_gfx_size_get(&ow, &oh));
@@ -2993,7 +3007,7 @@ _dragdone_post_cb(Eina_Bool accept, const Eo *wdg_eo, 
const Gui_Widget *drag_sta
 }
 
 static Eina_Bool
-_wdg_eo_del(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_wdg_eo_del(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Gui_Widget *wdg = data;
    /*FIXME: move this from here*/
@@ -3011,7 +3025,7 @@ _wdg_eo_del(void *data, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EI
 }
 
 static Eina_Bool
-_main_wdg_eo_del(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_main_wdg_eo_del(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Gui_Widget *wdg = data;
    /* If widget is Win, look for its frame and unset content, but don't delete 
frame. */
@@ -3426,7 +3440,16 @@ _wdg_update(void *data, Eid *subject_id EINA_UNUSED)
  * The given object is the one created in the properties view for each 
parameter.
  */
 static Eina_Bool
-_prop_update_from_propview(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info)
+_prop_update_from_propview_int(void *data, Eo *obj, const Eo_Event_Description 
*desc, void *event_info);
+
+static Eina_Bool
+_prop_update_from_propview(void *data, const Eo_Event *event)
+{
+   return _prop_update_from_propview_int(data, event->obj, event->desc, 
event->event_info);
+}
+
+static Eina_Bool
+_prop_update_from_propview_int(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info)
 {
    Par_Field_Data *pfd = NULL;
    const Eo_Class *kl = eo_class_get(obj);
@@ -3679,11 +3702,11 @@ _drop_property_cb(void *data, Evas_Object *obj, void 
*event_info EINA_UNUSED)
 
 /* callback to provide Context menu, when "..." button clicked for property. */
 static Eina_Bool
-_prop_ctx_menu_cb_func(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_prop_ctx_menu_cb_func(void *data EINA_UNUSED, const Eo_Event *event)
 {
    It_Data *it_data;
    Elm_Object_Item *it = NULL;
-   eo_do(obj, it_data = eo_key_data_get(_STR_EDITOR));
+   eo_do(event->obj, it_data = eo_key_data_get(_STR_EDITOR));
 
    Eo *ctxpopup = elm_ctxpopup_add(g->main_win->propsview_table);
    evas_object_smart_callback_add(ctxpopup, "dismissed", _ctxpopup_dismissed, 
NULL);
@@ -3706,13 +3729,13 @@ _prop_ctx_menu_cb_func(void *data EINA_UNUSED, Eo *obj, 
const Eo_Event_Descripti
 
 /* Callback to update item's 'public' state*/
 static Eina_Bool
-_item_public_update_cb(void *data, Eo *obj, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_item_public_update_cb(void *data, const Eo_Event *event)
 {
    Eina_Bool state;
    Gui_Widget *wdg = (Gui_Widget *) _editor_wdg_selected_get();
 
    Item_Container_Item *item = data, *new_item;
-   eo_do(obj, state = elm_obj_check_state_get());
+   eo_do(event->obj, state = elm_obj_check_state_get());
    new_item = item_container_item_copy(item);
    item_container_item_public_set(new_item, state);
 
@@ -3726,10 +3749,10 @@ _item_public_update_cb(void *data, Eo *obj, const 
Eo_Event_Description *desc EIN
 
 /* Callback to update item's label and callback */
 static Eina_Bool
-_field_update_from_itemview(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_field_update_from_itemview(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Par_Field_Data *pfd = NULL;
-   const Eo_Class *kl = eo_class_get(obj);
+   const Eo_Class *kl = eo_class_get(event->obj);
    const Op_Desc *op;
    const Gui_Widget *wdg = _editor_wdg_selected_get();
    const Item_Container_Item *wit;
@@ -3739,7 +3762,7 @@ _field_update_from_itemview(void *data EINA_UNUSED, Eo 
*obj, const Eo_Event_Desc
    Gui_Value *val;
 
    /* Get data for changed field. */
-   eo_do(obj, pfd = eo_key_data_get(_STR_EDITOR));
+   eo_do(event->obj, pfd = eo_key_data_get(_STR_EDITOR));
    op = pfd->it_data->op_desc;
    wit = pfd->it_data->item;
    idx = pfd->par_idx;
@@ -3772,7 +3795,7 @@ _field_update_from_itemview(void *data EINA_UNUSED, Eo 
*obj, const Eo_Event_Desc
    if (kl == ELM_ENTRY_CLASS)
      {
         const char *entry_data = NULL;
-        eo_do(obj, entry_data = elm_obj_layout_text_get(NULL));
+        eo_do(event->obj, entry_data = elm_obj_layout_text_get(NULL));
         if (type == GUI_TYPE_STRING)
           {
              gui_value_string_free(val);
@@ -3784,12 +3807,12 @@ _field_update_from_itemview(void *data EINA_UNUSED, Eo 
*obj, const Eo_Event_Desc
    if (kl == ELM_HOVERSEL_CLASS)
      {
         const char *old_value = NULL;
-        eo_do(obj, old_value = elm_obj_widget_part_text_get(NULL));
+        eo_do(event->obj, old_value = elm_obj_widget_part_text_get(NULL));
         const char *new_value = NULL;
-        eo_do(event_info, new_value = elm_wdg_item_part_text_get(NULL));
+        eo_do(event->event_info, new_value = elm_wdg_item_part_text_get(NULL));
         if (!strcmp(new_value, old_value))
           return EO_CALLBACK_CONTINUE;
-        eo_do(obj, elm_obj_widget_part_text_set(NULL, new_value));
+        eo_do(event->obj, elm_obj_widget_part_text_set(NULL, new_value));
         if (!strcmp(new_value, PROP_HOVERSEL_NONE_VALUE))
           {
              gui_value_name_id_set(val, type, 0);
@@ -4029,11 +4052,10 @@ _itemview_item_do_(unsigned int type)
 /************************ Content view Callbacks 
*******************************/
 
 /* Called when X button is pressed to delete item from container. */
-static Eina_Bool
-_content_del_from_propview(void *data, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+static void
+_content_del_from_propview(int idx)
 {
    const Gui_Widget *wdg = _editor_wdg_selected_get();
-   intptr_t idx = (intptr_t) data;
    Gui_Context *ctx = _active_context_get();
 
    /* Need to remove parent container from widget. */
@@ -4058,17 +4080,13 @@ _content_del_from_propview(void *data, Eo *obj 
EINA_UNUSED, const Eo_Event_Descr
 
         context_memento_finalize(ctx);
      }
-
-   return EO_CALLBACK_CONTINUE;
 }
 
 /* Called when Up/Down buttons are pressed to reorder contents of box*/
 static Eina_Bool
-_content_reorder_from_propview(void *data, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info)
+_content_reorder_from_propview(int idx, intptr_t button_dir)
 {
    const Gui_Widget *wdg = _editor_wdg_selected_get();
-   intptr_t idx = (intptr_t) data;
-   intptr_t button_dir = (intptr_t)event_info;
 
    if (wdg_obj_container_class_name_get(wdg) &&
         (!strcmp(wdg_obj_container_class_name_get(wdg), DB_DEF_BOX_CLASS) ||
@@ -4098,13 +4116,13 @@ _content_reorder_from_propview(void *data, Eo *obj 
EINA_UNUSED, const Eo_Event_D
 
 /* Called when different element is choosen in hooversel */
 static Eina_Bool
-_content_change_from_propview(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_content_change_from_propview(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Gui_Context *ctx = _active_context_get();
    Par_Field_Data *pfd = NULL;
-   const Eo_Class *kl = eo_class_get(obj);
+   const Eo_Class *kl = eo_class_get(event->obj);
    /* Get data for changed field. */
-   eo_do(obj, pfd = eo_key_data_get(_STR_EDITOR));
+   eo_do(event->obj, pfd = eo_key_data_get(_STR_EDITOR));
 
    const Gui_Widget *wdg = pfd->it_data->wdg;
    int par_idx = pfd->par_idx;
@@ -4128,8 +4146,8 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo 
*obj, const Eo_Event_De
    if (kl == ELM_HOVERSEL_CLASS)
      {
         const char *old_value = NULL, *new_value = NULL;
-        eo_do(event_info, new_value = elm_wdg_item_part_text_get(NULL));
-        eo_do(obj, old_value = elm_obj_widget_part_text_get(NULL));
+        eo_do(event->event_info, new_value = elm_wdg_item_part_text_get(NULL));
+        eo_do(event->obj, old_value = elm_obj_widget_part_text_get(NULL));
         if (!strcmp(new_value, old_value))
           return EO_CALLBACK_CONTINUE;
      }
@@ -4139,14 +4157,14 @@ _content_change_from_propview(void *data EINA_UNUSED, 
Eo *obj, const Eo_Event_De
        (!strcmp(container_class_name, DB_DEF_CONTAINER_CLASS)))
      {
         const char *entry_data;
-        eo_do(obj, entry_data = elm_obj_layout_text_get(NULL));
+        eo_do(event->obj, entry_data = elm_obj_layout_text_get(NULL));
         Object_Container_Item *oci = wdg_obj_container_item_get(wdg, 
pfd->it_data->idx, NULL);
         Gui_Widget_Property *pr = oci ? obj_container_item_prop_get(oci) : 
NULL;
         Gui_Value *v = prop_value_nth_get(pr, par_idx);
         if (_has_part(wdg, entry_data, NULL))
           {
              char *str = STRING_GET(v);
-             eo_do(obj, elm_obj_layout_text_set(NULL, str));
+             eo_do(event->obj, elm_obj_layout_text_set(NULL, str));
              return EO_CALLBACK_CONTINUE;
           }
      }
@@ -4192,7 +4210,7 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo 
*obj, const Eo_Event_De
    if (kl == ELM_ENTRY_CLASS)
      {
         const char *entry_data;
-        eo_do(obj, entry_data = elm_obj_layout_text_get(NULL));
+        eo_do(event->obj, entry_data = elm_obj_layout_text_get(NULL));
 
         /* Run CONTENT_PACK for table in order to reset with new coordinates. 
*/
         if (!strcmp(container_class_name, DB_DEF_TABLE_CLASS) ||
@@ -4205,7 +4223,7 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo 
*obj, const Eo_Event_De
                   char str[12];
                   number = INT_GET(val);
                   sprintf(str, "%d", number);
-                  eo_do(obj, elm_obj_layout_text_set(NULL, str));
+                  eo_do(event->obj, elm_obj_layout_text_set(NULL, str));
                }
              gui_value_int_set(val, number);
 
@@ -4252,9 +4270,9 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo 
*obj, const Eo_Event_De
    Eid *old_packed_eid = NULL;
    if (kl == ELM_HOVERSEL_CLASS)
      {
-        const char *new_value = elm_object_item_part_text_get(event_info, 
NULL);
+        const char *new_value = 
elm_object_item_part_text_get(event->event_info, NULL);
         Eid *new_name_id = gui_context_eid_get_by_name(ctx, new_value);
-        eo_do(obj, elm_obj_widget_part_text_set(NULL, new_value));
+        eo_do(event->obj, elm_obj_widget_part_text_set(NULL, new_value));
 
         if (type == GUI_TYPE_ENUM)
           {
@@ -4385,11 +4403,11 @@ _switch_to_context(Gui_Context *ctx)
    eo_do(g->main_win->toolbar_redo_it, 
elm_wdg_item_disabled_set(context_can_redo(ctx) ? EINA_FALSE : EINA_TRUE));
    eo_do(g->main_win->toolbar_undo_it, 
elm_wdg_item_disabled_set(context_can_undo(ctx) ? EINA_FALSE : EINA_TRUE));
 
-   _canvas_resize_cb(NULL, g->main_win->canvas_scroller, NULL, NULL);
+   _canvas_resize_cb_int(g->main_win->canvas_scroller);
    _canvas_name_update(ctx, EINA_FALSE);
    Eina_Stringshare *theme_name = 
gui_context_edit_theme_name_get(_active_context_get());
    eo_do(g->main_win->theme_selector_hoversel, 
elm_obj_widget_part_text_set(NULL, THEME_NAME_GET(theme_name)));
-   _theme_selector_hover_selected_cb(NULL, NULL, NULL, NULL);
+   _theme_selector_hover_selected_cb(NULL, NULL);
 
    Gui_Widget *wdg = gui_context_data_get(ctx, SELECTED_WDG);
    _editor_wdg_selected_set(wdg);
@@ -4613,7 +4631,7 @@ _key_binding_zoom_cb(void *data)
         scale = 1.0;
      }
    gui_context_scale_set(ctx, scale);
-   _canvas_resize_cb(NULL, g->main_win->canvas_scroller, NULL, NULL);
+   _canvas_resize_cb_int(g->main_win->canvas_scroller);
 }
 
 static void
@@ -4628,13 +4646,13 @@ _factory_theme_apply(Elm_Theme *theme)
 }
 
 Eina_Bool
-_theme_selector_hover_selected_cb(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info)
+_theme_selector_hover_selected_cb(void *data EINA_UNUSED, const Eo_Event 
*event)
 {
-   if (event_info)
+   if (event->event_info)
      {
         const char *choosen_value;
-        eo_do(event_info, choosen_value = elm_wdg_item_part_text_get(NULL));
-        eo_do(obj, elm_obj_widget_part_text_set(NULL, 
THEME_NAME_GET(choosen_value)));
+        eo_do(event->event_info, choosen_value = 
elm_wdg_item_part_text_get(NULL));
+        eo_do(event->obj, elm_obj_widget_part_text_set(NULL, 
THEME_NAME_GET(choosen_value)));
         gui_context_edit_theme_name_set(_active_context_get(), choosen_value);
      }
 
@@ -4721,8 +4739,8 @@ _max_coords_get(Evas_Coord *left_x, Evas_Coord *top_y, 
Evas_Coord *right_x, Evas
 }
 
 /* Callback called on canvas_scroller resize: t.e. when window or panes is 
resized. */
-Eina_Bool
-_canvas_resize_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+static Eina_Bool
+_canvas_resize_cb_int(Eo *obj)
 {
    Evas_Coord right_x, bottom_y, left_x, top_y;
    _max_coords_get(&left_x, &top_y, &right_x, &bottom_y);
diff --git a/src/bin/gui/egui_logic.c b/src/bin/gui/egui_logic.c
index ccb8acf..fe150f9 100644
--- a/src/bin/gui/egui_logic.c
+++ b/src/bin/gui/egui_logic.c
@@ -913,9 +913,9 @@ _toolbar_simulate_cb(void *data, Evas_Object *obj 
EINA_UNUSED, void *event_info
 
 /* Callback to hide tooltip from factory, when mouse_down on it for dragging. 
*/
 static Eina_Bool
-_factory_tt_mouse_down(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_factory_tt_mouse_down(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   elm_object_tooltip_hide(obj);
+   elm_object_tooltip_hide(event->obj);
    return EO_CALLBACK_CONTINUE;
 }
 
diff --git a/src/bin/gui/itemview.c b/src/bin/gui/itemview.c
index fd710f5..3e20f76 100644
--- a/src/bin/gui/itemview.c
+++ b/src/bin/gui/itemview.c
@@ -29,14 +29,14 @@ itemview_cbs_get()
 }
 
 static Eina_Bool
-_pfd_free(void *pfd, Eo *obj EINA_UNUSED, const Eo_Event_Description2 *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_pfd_free(void *pfd, const Eo_Event *event EINA_UNUSED)
 {
    free(pfd);
    return EINA_TRUE;
 }
 
 static Eina_Bool
-_it_data_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description2 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_it_data_free_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    _it_data_free(data);
    return EINA_TRUE;
diff --git a/src/bin/gui/itemview.h b/src/bin/gui/itemview.h
index b716172..009af32 100644
--- a/src/bin/gui/itemview.h
+++ b/src/bin/gui/itemview.h
@@ -6,8 +6,8 @@
 
 typedef struct
 {
-   Eina_Bool (*item_update_cb_func)(void *data, Eo *obj, const 
Eo_Event_Description *desc, void *event_info);
-   Eina_Bool (*item_public_update_cb_func)(void *data, Eo *obj, const 
Eo_Event_Description *desc, void *event_info);
+   Eina_Bool (*item_update_cb_func)(void *data, const Eo_Event *event);
+   Eina_Bool (*item_public_update_cb_func)(void *data, const Eo_Event *event);
    Evas_Smart_Cb item_selection_cb_func;
    Eina_Bool (*_itemview_item_do_)(unsigned int type);
 } ItemViewCbs;
diff --git a/src/bin/gui/popup.c b/src/bin/gui/popup.c
index 20e3018..d33fe63 100644
--- a/src/bin/gui/popup.c
+++ b/src/bin/gui/popup.c
@@ -18,9 +18,10 @@
     })
 
 static Eina_Bool
-_popup_close_cb(void *data, Eo *obj, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_popup_close_cb(void *data, const Eo_Event *event)
 {
    Popup_Button_Type _pressed_button_type = (uintptr_t) data;
+   Eo *obj = event->obj;
    /* Delete popup and call a callback afterwards. */
 
    Eo *popup;
diff --git a/src/bin/gui/prop_layout.c b/src/bin/gui/prop_layout.c
index 4ee7109..f325540 100644
--- a/src/bin/gui/prop_layout.c
+++ b/src/bin/gui/prop_layout.c
@@ -290,8 +290,7 @@ proplayout_view_switch(It_Data_Type type)
 }
 
 static Eina_Bool
-_proplayout_filter_entry_changed_cb(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED,
-                                  const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_proplayout_filter_entry_changed_cb(void *data EINA_UNUSED, const Eo_Event 
*event EINA_UNUSED)
 {
    const Gui_Context *ctx = _active_context_get();
    if (!ctx) return EO_CALLBACK_CONTINUE;
diff --git a/src/bin/gui/props_helper.c b/src/bin/gui/props_helper.c
index 211839f..1ec6118 100644
--- a/src/bin/gui/props_helper.c
+++ b/src/bin/gui/props_helper.c
@@ -627,8 +627,9 @@ props_value_add(Eo *box, const Gui_Widget *wdg, const 
Gui_Value *value, const Op
 
 /* Callback deletes a bubble when object is unfocused. */
 static Eina_Bool
-_unfocused_cb(void *data, Eo *obj, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_unfocused_cb(void *data, const Eo_Event *event)
 {
+   Eo *obj = event->obj;
    Eo *bubble = data;
    eo_do(obj, eo_event_callback_del(ELM_WIDGET_EVENT_UNFOCUSED, _unfocused_cb, 
bubble));
    eo_del(bubble);
@@ -637,8 +638,9 @@ _unfocused_cb(void *data, Eo *obj, const 
Eo_Event_Description *desc EINA_UNUSED,
 
 /* Callback creates a bubble when object is focused. */
 static Eina_Bool
-_focused_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, 
void *event_info EINA_UNUSED)
+_focused_cb(void *data, const Eo_Event *event)
 {
+   Eo *obj = event->obj;
    Evas_Coord x ,y;
 
    Eo *lbl = elm_label_add(obj);
diff --git a/src/bin/gui/propview.c b/src/bin/gui/propview.c
index aebb489..58e6b8c 100644
--- a/src/bin/gui/propview.c
+++ b/src/bin/gui/propview.c
@@ -34,9 +34,9 @@ PropViewCbs *propview_cbs_get()
 }
 
 static Eina_Bool
-_default_hover_selected_cb(void *data, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info)
+_default_hover_selected_cb(void *data, const Eo_Event *event)
 {
-   const char *choosen_value = elm_object_item_part_text_get(event_info, NULL);
+   const char *choosen_value = 
elm_object_item_part_text_get(event->event_info, NULL);
    Eo *entry = data;
    Par_Field_Data *pfd = NULL;
    eo_do(entry, pfd = eo_key_data_get(_STR_EDITOR));
@@ -55,16 +55,19 @@ _default_hover_selected_cb(void *data, Eo *obj EINA_UNUSED, 
const Eo_Event_Descr
                }
           }
      }
-   _view_cbs->property_update_cb_func(NULL, entry, NULL, NULL);
+   Eo_Event *event_tmp = calloc(1, sizeof(Eo_Event));
+   event_tmp->obj = entry;
+   _view_cbs->property_update_cb_func(NULL, event_tmp);
+   free(event_tmp);
    return EO_CALLBACK_CONTINUE;
 }
 
 /* This will be called when hoversel item is selected.
  * If "Add resource..." item was selected, oper Resource Manager*/
 static Eina_Bool
-_hover_selected_cb(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info)
+_hover_selected_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   const char *choosen_value = elm_object_item_part_text_get(event_info, NULL);
+   const char *choosen_value = 
elm_object_item_part_text_get(event->event_info, NULL);
    if (!strcmp(choosen_value, PROP_HOVERSEL_ADD_RESOURCE_VALUE))
      {
         const Egui_Layout_Widgets *g_main_wdgs = egui_layout_gui_get();
@@ -73,13 +76,13 @@ _hover_selected_cb(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *
      }
    else
      {
-        _view_cbs->property_update_cb_func(NULL, obj, NULL, event_info);
+        _view_cbs->property_update_cb_func(NULL, event);
      }
    return EO_CALLBACK_CONTINUE;
 }
 
 static Eina_Bool
-_pfd_free_cb(void *pfd, Eo *obj EINA_UNUSED, const Eo_Event_Description2 *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_pfd_free_cb(void *pfd, const Eo_Event *event EINA_UNUSED)
 {
    free(pfd);
    return EINA_TRUE;
diff --git a/src/bin/gui/propview.h b/src/bin/gui/propview.h
index 3af7d00..739f0c4 100644
--- a/src/bin/gui/propview.h
+++ b/src/bin/gui/propview.h
@@ -8,8 +8,8 @@
 
 typedef struct
 {
-   Eina_Bool (*property_update_cb_func)(void *data, Eo *obj, const 
Eo_Event_Description *desc, void *event_info);
-   Eina_Bool (*property_ctx_menu_cb_func)(void *data, Eo *obj, const 
Eo_Event_Description *desc, void *event_info);
+   Eina_Bool (*property_update_cb_func)(void *data, const Eo_Event *event);
+   Eina_Bool (*property_ctx_menu_cb_func)(void *data, const Eo_Event *event);
 } PropViewCbs;
 
 PropViewCbs *
diff --git a/src/bin/gui/rmview.c b/src/bin/gui/rmview.c
index d9f51db..815c867 100644
--- a/src/bin/gui/rmview.c
+++ b/src/bin/gui/rmview.c
@@ -63,7 +63,7 @@ typedef struct
     })
 
 static Eina_Bool
-_field_data_free(void *_data, Eo *obj EINA_UNUSED, const Eo_Event_Description2 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_field_data_free(void *_data, const Eo_Event *event EINA_UNUSED)
 {
    Rmview_Field_Data *data = _data;
    if (--data->it_data->ref_count == 0)
@@ -149,8 +149,9 @@ _rmview_box_add(Eo *parent, Eina_Bool horiz)
 /* Callback on entry change.
  * Used to enable/disable SAVE button. */
 static Eina_Bool
-_res_changed(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_res_changed(void *data EINA_UNUSED, const Eo_Event *event)
 {
+   Eo *obj = event->obj;
    Rmview_Field_Data *f_data;
    eo_do(obj, f_data = eo_key_data_get(_STR_RMVIEW));
    Eo *entry_field = NULL;
@@ -250,8 +251,9 @@ _res_changed(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *desc E
 }
 
 static Eina_Bool
-_enventor_clicked(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_enventor_clicked(void *data EINA_UNUSED, const Eo_Event *event)
 {
+   Eo *obj = event->obj;
    Rmview_Field_Data *f_data = eo_do_ret(obj, f_data, 
eo_key_data_get(_STR_RMVIEW));
    const char *edc_file = eo_do_ret(f_data->it_data->en3, edc_file, 
elm_interface_fileselector_path_get());
    if (strlen(edc_file))
@@ -282,8 +284,9 @@ _enventor_clicked(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *d
 
 /* callback on sve_button 'clicked' event */
 static Eina_Bool
-_bt_save_clicked(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_bt_save_clicked(void *data EINA_UNUSED, const Eo_Event *event)
 {
+   Eo *obj = event->obj;
    Rmview_Field_Data *f_data;
    const char *str = NULL, *res_name;
    Eina_Bool status = EINA_TRUE;
@@ -366,8 +369,9 @@ _bt_save_clicked(void *data EINA_UNUSED, Eo *obj, const 
Eo_Event_Description *de
 
 /* callback on del_button 'clicked' event */
 static Eina_Bool
-_bt_del_clicked(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_bt_del_clicked(void *data EINA_UNUSED, const Eo_Event *event)
 {
+   Eo *obj = event->obj;
    Rmview_Field_Data *f_data;
 
    eo_do(obj, f_data = eo_key_data_get(_STR_RMVIEW));
@@ -702,7 +706,7 @@ _rmview_build(Rmview_Resource_Type type)
 
 /* Delete window callback. */
 Eina_Bool
-_rm_win_request_delete(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_rm_win_request_delete(void *data EINA_UNUSED, const Eo_Event *event 
EINA_UNUSED)
 {
    _rmview_toolbar_selected_type = RMVIEW_NOT_SELECTED;
    return EO_CALLBACK_CONTINUE;
@@ -726,7 +730,7 @@ _rmview_toolbar_clicked(void *data, Evas_Object *obj 
EINA_UNUSED, void *event_in
 
 /* "Add Resource" button's "clicked" callback." */
 Eina_Bool
-_rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_rm_add_button_clicked(void *data EINA_UNUSED, const Eo_Event *event 
EINA_UNUSED)
 {
    Gui_Resource_Type res_type = RESOURCE_SENTINEL;
    const char *alias_str = NULL, *value_str = NULL;
diff --git a/src/bin/gui/settings_view.c b/src/bin/gui/settings_view.c
index 9ccc65b..ddec315 100644
--- a/src/bin/gui/settings_view.c
+++ b/src/bin/gui/settings_view.c
@@ -224,9 +224,10 @@ settings_win_post_configure()
 }
 
 static Eina_Bool
-_start_pt_chk_chg(void *data, Eo *obj, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_start_pt_chk_chg(void *data, const Eo_Event *event)
 {
    Eid *wdg_id = data;
+   Eo *obj = event->obj;
    Eina_Bool state = eo_do_ret(obj, state, elm_obj_check_state_get());
    if (state)
       _start_pts = eina_list_append(_start_pts, wdg_id);
diff --git a/src/lib/generator.c b/src/lib/generator.c
index f53ead8..b3ea058 100644
--- a/src/lib/generator.c
+++ b/src/lib/generator.c
@@ -947,7 +947,7 @@ _wdg_cb_add_generate(Gui_Session *session, const Gui_Widget 
*wdg, const Gui_Widg
           {
              eina_strbuf_append_printf(_wdg_cb_type_foo,
                    "static Eina_Bool\n"
-                   "%s(void *data, Eo *obj, const Eo_Event *event)\n"
+                   "%s(void *data, const Eo_Event *event)\n"
                    "{\n",
                    _wdg_cb_type_str
                    );
diff --git a/src/lib/gui_widget.c b/src/lib/gui_widget.c
index 073a880..86ecc31 100644
--- a/src/lib/gui_widget.c
+++ b/src/lib/gui_widget.c
@@ -3697,10 +3697,11 @@ session_wins_get(Gui_Session *session)
 }
 
 static Eina_Bool
-_obj_remove_from_session(void *data, Eo *obj, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_obj_remove_from_session(void *data, const Eo_Event *event)
 {
    Gui_Widget *wdg;
    Gui_Session *session = data;
+   Eo *obj = event->obj;
    eo_do(obj, wdg = eo_key_data_get("_session_wdg"));
    session_eo_set(session, wdg, NULL);
    return EINA_TRUE;
diff --git a/src/lib/simulator.c b/src/lib/simulator.c
index 27f4776..d60d11b 100644
--- a/src/lib/simulator.c
+++ b/src/lib/simulator.c
@@ -28,7 +28,7 @@ typedef struct
 } Exec_Action_Data;
 
 static Eina_Bool
-_execute_action(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_execute_action(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Exec_Action_Data *exec_data = data;
    const Gui_Action *action = exec_data->action;
@@ -285,7 +285,7 @@ end:
 
 /* When 'Back' function is clicked we pop last opened widget and delete it.*/
 static Eina_Bool
-_target_back_button_clicked(void *data, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_target_back_button_clicked(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Gui_Session *session = data;
    Gui_Widget *wdg;
@@ -316,9 +316,10 @@ _target_back_button_clicked(void *data, Eo *obj 
EINA_UNUSED, const Eo_Event_Desc
 
 /* Rotate callback*/
 static Eina_Bool
-_target_rotate_button_clicked(void *data, Eo *obj, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_target_rotate_button_clicked(void *data, const Eo_Event *event)
 {
    Gui_Session *session = data;
+   Eo *obj = event->obj;
    Eo *menu_box;
    eo_do(obj, menu_box = eo_key_data_get("menu_box"));
 

-- 


Reply via email to