Fix code to conform to recent Eo changes.

16 files changed, 127 insertions, 68 deletions

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index cf2758d5a..543351ca7 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -913,9 +913,9 @@ EOLIAN static void
 _elm_ctxpopup_item_elm_widget_item_disable(Eo *eo_ctxpopup_it,
                                            Elm_Ctxpopup_Item_Data *ctxpopup_it)
 {
-
+   Eina_Bool tmp;
    elm_object_item_disabled_set
-     (ctxpopup_it->list_item, eo_do(eo_ctxpopup_it, elm_wdg_item_disabled_get()));
+     (ctxpopup_it->list_item, eo_do_ret(eo_ctxpopup_it, tmp, elm_wdg_item_disabled_get()));
 }
 
 EOLIAN static void
@@ -1401,7 +1401,8 @@ _elm_ctxpopup_item_init(Eo *eo_item,
           Evas_Smart_Cb func,
           const void *data)
 {
-   Eo *obj = eo_do(eo_item, eo_parent_get());
+   Eo *obj;
+   eo_do(eo_item, obj = eo_parent_get());
    Elm_Ctxpopup_Data *sd = eo_data_scope_get(obj, ELM_CTXPOPUP_CLASS);
    if (!sd->list)
      {
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index abd6cdfca..df6fe81ce 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1431,7 +1431,7 @@ static Eina_Bool
 _key_action_top_item_get(Evas_Object *obj, const char *params EINA_UNUSED)
 {
    Elm_Object_Item *eo_item = NULL;
-   eo_item = eo_do(obj, elm_obj_naviframe_top_item_get());
+   eo_do(obj, eo_item = elm_obj_naviframe_top_item_get());
    if (!eo_item) return EINA_FALSE;
 
    //FIXME: Replace this below code to elm_naviframe_item_pop() at elm 2.0.
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index f23ad2221..5ab938d74 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -749,9 +749,10 @@ _elm_popup_item_elm_widget_item_part_content_unset(Eo *eo_it EINA_UNUSED, Elm_Po
 EOLIAN static void
 _elm_popup_item_elm_widget_item_disable(Eo *eo_it, Elm_Popup_Item_Data *it)
 {
+   Eina_Bool tmp;
    ELM_POPUP_ITEM_CHECK_OR_RETURN(it);
 
-   if (eo_do(eo_it, elm_wdg_item_disabled_get()))
+   if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get()))
      elm_layout_signal_emit(VIEW(it), "elm,state,item,disabled", "elm");
    else
      elm_layout_signal_emit(VIEW(it), "elm,state,item,enabled", "elm");
@@ -1105,6 +1106,7 @@ _action_button_set(Evas_Object *obj,
 EOLIAN static Eina_Bool
 _elm_popup_elm_container_content_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
 {
+   Eina_Bool tmp;
    unsigned int i;
 
    if (!part || !strcmp(part, "default"))
@@ -1124,7 +1126,7 @@ _elm_popup_elm_container_content_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, c
         _action_button_set(obj, content, i);
      }
    else
-     return eo_do(_pd->main_layout, elm_obj_container_content_set(part, content));
+     return eo_do_ret(_pd->main_layout, tmp, elm_obj_container_content_set(part, content));
 
    return EINA_TRUE;
 }
@@ -1176,7 +1178,7 @@ _elm_popup_elm_container_content_get(Eo *obj, Elm_Popup_Data *_pd, const char *p
         content = _action_button_get(obj, i);
      }
    else
-     content = eo_do(_pd->main_layout, elm_obj_container_content_get(part));
+      eo_do(_pd->main_layout, content = elm_obj_container_content_get(part));
 
    if (!content)
      goto err;
@@ -1200,7 +1202,7 @@ _content_unset(Evas_Object *obj)
    evas_object_event_callback_del
      (sd->content, EVAS_CALLBACK_DEL, _on_content_del);
 
-   content = eo_do(sd->content_area, elm_obj_container_content_unset(CONTENT_PART));
+   eo_do(sd->content_area, content = elm_obj_container_content_unset(CONTENT_PART));
    sd->content = NULL;
 
    elm_layout_sizing_eval(obj);
@@ -1635,7 +1637,7 @@ _elm_popup_item_append(Eo *obj, Elm_Popup_Data *sd, const char *label, Evas_Obje
    ELM_POPUP_ITEM_DATA_GET(eo_it, it);
    if (sd->content || sd->text_content_obj)
      {
-        prev_content = eo_do(sd->content_area,
+        eo_do(sd->content_area, prev_content =
                              elm_obj_container_content_get(CONTENT_PART));
         evas_object_del(prev_content);
      }
diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c
index a3f5e2409..56f04a753 100644
--- a/src/lib/elm_atspi_bridge.c
+++ b/src/lib/elm_atspi_bridge.c
@@ -651,7 +651,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED,
    iter_array = eldbus_message_iter_container_new(iter, 'a', "(ua(so))");
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
-   rels = eo_do(obj, elm_interface_atspi_accessible_relation_set_get());
+   eo_do(obj, rels = elm_interface_atspi_accessible_relation_set_get());
 
    EINA_LIST_FREE(rels, rel)
      {
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index 425586a9e..94e5f360c 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -274,7 +274,8 @@ _elm_bg_class_constructor(Eo_Class *klass)
 EAPI Eina_Bool
 elm_bg_file_set(Eo *obj, const char *file, const char *group)
 {
-   return eo_do((Eo *) obj, efl_file_set(file, group));
+   Eina_Bool ret;
+   return eo_do_ret((Eo *) obj, ret, efl_file_set(file, group));
 }
 
 EAPI void
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 4a296937e..413a7d536 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -2161,7 +2161,8 @@ _elm_color_item_selected_set(Eo *eo_item,
 EAPI Eina_Bool
 elm_colorselector_palette_item_selected_get(const Elm_Object_Item *it)
 {
-   return eo_do( it, elm_obj_color_item_selected_get());
+   Eina_Bool ret;
+   return eo_do_ret(it, ret, elm_obj_color_item_selected_get());
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 0fcf37fb2..901e9be82 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -513,11 +513,12 @@ _item_mouse_move_cb(void *data,
 static Eina_Bool
 _long_press_cb(void *data)
 {
+   Eina_Bool tmp;
    Elm_Gen_Item *it = data;
    ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
 
    it->long_timer = NULL;
-   if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()) || (it->dragging))
+   if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || (it->dragging))
      return ECORE_CALLBACK_CANCEL;
    sd->longpressed = EINA_TRUE;
    evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it));
@@ -648,6 +649,7 @@ _item_mouse_up_cb(void *data,
                   Evas_Object *obj EINA_UNUSED,
                   void *event_info)
 {
+   Eina_Bool tmp;
    Evas_Event_Mouse_Up *ev = event_info;
    Eina_Bool dragged = EINA_FALSE;
    Elm_Gen_Item *it = data;
@@ -719,7 +721,7 @@ _item_mouse_up_cb(void *data,
           _elm_gengrid_item_unrealize(it, EINA_FALSE);
      }
 
-   if (eo_do(eo_it, elm_wdg_item_disabled_get()) || (dragged)) return;
+   if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get()) || (dragged)) return;
 
    if (sd->focused_item != eo_it)
      elm_object_item_focus_set(eo_it, EINA_TRUE);
@@ -850,6 +852,7 @@ _access_widget_item_register(Elm_Gen_Item *it)
 static void
 _item_realize(Elm_Gen_Item *it)
 {
+   Eina_Bool tmp;
    char buf[1024];
    char style[1024];
    ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
@@ -990,7 +993,7 @@ _item_realize(Elm_Gen_Item *it)
 
         if (it->selected)
           edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
-        if (eo_do(eo_it, elm_wdg_item_disabled_get()))
+        if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get()))
           edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
         if (it == (Elm_Gen_Item *)sd->focused_item &&
             elm_widget_focus_highlight_enabled_get(WIDGET(it)))
@@ -1584,6 +1587,7 @@ _elm_gengrid_pan_class_constructor(Eo_Class *klass)
 static void
 _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
 {
+   Eina_Bool tmp;
    ELM_GENGRID_ITEM_DATA_GET(eo_it, it);
    Evas_Object *obj = WIDGET(it);
    ELM_GENGRID_DATA_GET(obj, sd);
@@ -1594,7 +1598,7 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
 
    if (_is_no_select(it) ||
        (eo_it == sd->focused_item) ||
-       (eo_do(eo_it, elm_wdg_item_disabled_get())))
+       (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get())))
      return;
 
    switch (_elm_config->focus_autoscroll_mode)
@@ -3392,11 +3396,12 @@ _elm_gengrid_item_compare(const void *data,
 EOLIAN static void
 _elm_gengrid_item_elm_widget_item_disable(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it)
 {
+   Eina_Bool tmp;
    if (it->generation < GG_IT(it)->wsd->generation) return;
 
    if (it->realized)
      {
-        if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()))
+        if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
           edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
         else
           edje_object_signal_emit(VIEW(it), "elm,state,enabled", "elm");
@@ -4087,8 +4092,9 @@ EOLIAN static void
 _elm_gengrid_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it,
       Eina_Bool selected)
 {
+   Eina_Bool tmp;
    ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
-   if ((it->generation < sd->generation) || eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()))
+   if ((it->generation < sd->generation) || eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
      return;
    selected = !!selected;
    if (it->selected == selected) return;
@@ -4277,7 +4283,8 @@ _elm_gengrid_item_elm_widget_item_tooltip_style_set(Eo *eo_it, Elm_Gen_Item *it,
 EAPI const char *
 elm_gengrid_item_tooltip_style_get(const Elm_Object_Item *it)
 {
-   return eo_do(it, elm_wdg_item_tooltip_style_get());
+   const char *ret;
+   return eo_do_ret(it, ret, elm_wdg_item_tooltip_style_get());
 }
 
 EOLIAN static const char *
@@ -4290,7 +4297,8 @@ EAPI Eina_Bool
 elm_gengrid_item_tooltip_window_mode_set(Elm_Object_Item *it,
                                          Eina_Bool disable)
 {
-   return eo_do(it, elm_wdg_item_tooltip_window_mode_set(disable));
+   Eina_Bool ret;
+   return eo_do_ret(it, ret, elm_wdg_item_tooltip_window_mode_set(disable));
 }
 
 EOLIAN static Eina_Bool
@@ -4299,8 +4307,12 @@ _elm_gengrid_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
 {
    it->tooltip.free_size = disable;
    if (VIEW(it))
-      return eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS,
-            elm_wdg_item_tooltip_window_mode_set(disable));
+     {
+        Eina_Bool ret;
+        eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS,
+            ret = elm_wdg_item_tooltip_window_mode_set(disable));
+        return ret;
+     }
 
    return EINA_TRUE;
 }
@@ -4308,7 +4320,8 @@ _elm_gengrid_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
 EAPI Eina_Bool
 elm_gengrid_item_tooltip_window_mode_get(const Elm_Object_Item *it)
 {
-   return eo_do(it, elm_wdg_item_tooltip_window_mode_get());
+   Eina_Bool ret;
+   return eo_do_ret(it, ret, elm_wdg_item_tooltip_window_mode_get());
 }
 
 EOLIAN static Eina_Bool
@@ -4340,7 +4353,8 @@ _elm_gengrid_item_elm_widget_item_cursor_set(Eo *eo_it, Elm_Gen_Item *it,
 EAPI const char *
 elm_gengrid_item_cursor_get(const Elm_Object_Item *it)
 {
-   return eo_do(it, elm_wdg_item_cursor_get());
+   const char *ret;
+   return eo_do_ret(it, ret, elm_wdg_item_cursor_get());
 }
 
 EAPI void
@@ -4372,7 +4386,8 @@ elm_gengrid_item_cursor_style_set(Elm_Object_Item *it,
 EAPI const char *
 elm_gengrid_item_cursor_style_get(const Elm_Object_Item *it)
 {
-   return eo_do(it, elm_wdg_item_cursor_style_get());
+   const char *ret;
+   return eo_do_ret(it, ret, elm_wdg_item_cursor_style_get());
 }
 
 EAPI void
@@ -4385,7 +4400,8 @@ elm_gengrid_item_cursor_engine_only_set(Elm_Object_Item *it,
 EAPI Eina_Bool
 elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *it)
 {
-   return eo_do( it, elm_wdg_item_cursor_engine_only_get());
+   Eina_Bool ret;
+   return eo_do_ret(it, ret, elm_wdg_item_cursor_engine_only_get());
 }
 
 EAPI void
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index da02d8d46..1a4b03460 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -338,6 +338,7 @@ _item_content_realize(Elm_Gen_Item *it,
                       const char *src,
                       const char *parts)
 {
+   Eina_Bool tmp;
    Evas_Object *content;
 
    if (!parts)
@@ -377,7 +378,7 @@ _item_content_realize(Elm_Gen_Item *it,
                   continue;
                }
              elm_widget_sub_object_add(WIDGET(it), content);
-             if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()))
+             if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
                elm_widget_disabled_set(content, EINA_TRUE);
           }
      }
@@ -1187,6 +1188,7 @@ static void
 _elm_genlist_item_state_update(Elm_Gen_Item *it,
                                Item_Cache *itc)
 {
+   Eina_Bool tmp;
    if (itc)
      {
         if (it->selected != itc->selected)
@@ -1199,9 +1201,9 @@ _elm_genlist_item_state_update(Elm_Gen_Item *it,
                       (it->deco_all_view, SIGNAL_SELECTED, "elm");
                }
           }
-        if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()) != itc->disabled)
+        if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) != itc->disabled)
           {
-             if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()))
+             if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
                edje_object_signal_emit(VIEW(it), SIGNAL_DISABLED,"elm");
              if (it->deco_all_view)
                edje_object_signal_emit
@@ -1225,7 +1227,7 @@ _elm_genlist_item_state_update(Elm_Gen_Item *it,
                edje_object_signal_emit
                  (it->deco_all_view, SIGNAL_SELECTED, "elm");
           }
-        if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()))
+        if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
           {
              edje_object_signal_emit(VIEW(it), SIGNAL_DISABLED, "elm");
              if (it->deco_all_view)
@@ -1479,7 +1481,7 @@ _item_cache_add(Elm_Gen_Item *it)
    itc->item_style = eina_stringshare_add(it->itc->item_style);
    if (it->item->type & ELM_GENLIST_ITEM_TREE) itc->tree = 1;
    itc->selected = it->selected;
-   itc->disabled = eo_do(EO_OBJ(it), elm_wdg_item_disabled_get());
+   eo_do(EO_OBJ(it), itc->disabled = elm_wdg_item_disabled_get());
    itc->expanded = it->item->expanded;
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
    ELM_SAFE_FREE(it->item->swipe_timer, ecore_timer_del);
@@ -2514,10 +2516,11 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
    Evas_Object *obj = WIDGET(it);
    ELM_GENLIST_DATA_GET(obj, sd);
    const char *focus_raise;
+   Eina_Bool tmp;
 
    if (_is_no_select(it) ||
        (eo_it == sd->focused_item) ||
-       (eo_do(eo_it, elm_wdg_item_disabled_get())))
+       (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get())))
      return;
 
    switch (_elm_config->focus_autoscroll_mode)
@@ -2579,6 +2582,7 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
    Elm_Object_Item *eo_next;
    Elm_Object_Item *eo_first_item;
    Elm_Object_Item *eo_last_item;
+   Eina_Bool tmp;
 
    if (!sd->focused_item)
      {
@@ -2590,7 +2594,7 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
           return EINA_FALSE;
 
         while ((next) &&
-               (!eo_do(EO_OBJ(next), elm_wdg_item_disabled_get())))
+               (!eo_do_ret(EO_OBJ(next), tmp, elm_wdg_item_disabled_get())))
           next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
      }
    else
@@ -2603,7 +2607,7 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
              eo_next = elm_genlist_item_prev_get(sd->focused_item);
              next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
 
-             while (eo_do(eo_next, elm_wdg_item_disabled_get()))
+             while (eo_do_ret(eo_next, tmp, elm_wdg_item_disabled_get()))
                {
                   eo_next = elm_genlist_item_prev_get(eo_next);
                   next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
@@ -2616,7 +2620,7 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
              eo_next = elm_genlist_item_next_get(sd->focused_item);
              next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
 
-             while (eo_do(eo_next, elm_wdg_item_disabled_get()))
+             while (eo_do_ret(eo_next, tmp, elm_wdg_item_disabled_get()))
                {
                   eo_next = elm_genlist_item_next_get(eo_next);
                   next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
@@ -3242,12 +3246,13 @@ _show_region_hook(void *data EINA_UNUSED,
 static void
 _item_highlight(Elm_Gen_Item *it)
 {
+   Eina_Bool tmp;
    const char *selectraise;
    ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
 
    if (_is_no_select(it) ||
        (!sd->highlight) ||
-       (it->highlighted) || eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()) ||
+       (it->highlighted) || eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) ||
        (it->item->deco_it_view))
      return;
 
@@ -3743,6 +3748,7 @@ _item_mouse_move_cb(void *data,
 static Eina_Bool
 _long_press_cb(void *data)
 {
+   Eina_Bool tmp;
    Elm_Gen_Item *it = data;
    Elm_Object_Item *eo_it_tmp;
    Eina_List *list;
@@ -3750,7 +3756,7 @@ _long_press_cb(void *data)
 
    it->long_timer = NULL;
    if (_is_no_select(it) ||
-       eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()) || (it->dragging))
+       eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || (it->dragging))
      return ECORE_CALLBACK_CANCEL;
 
    sd->longpressed = EINA_TRUE;
@@ -3793,10 +3799,11 @@ static void
 _swipe_do(Elm_Gen_Item *it)
 {
    int i, sum = 0;
+   Eina_Bool tmp;
    ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
 
    if (_is_no_select(it) ||
-       eo_do(EO_OBJ(it), elm_wdg_item_disabled_get())) return;
+       eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get())) return;
 
    sd->swipe = EINA_FALSE;
    for (i = 0; i < sd->movements; i++)
@@ -3972,6 +3979,7 @@ _item_mouse_down_cb(void *data,
                     Evas_Object *obj,
                     void *event_info)
 {
+   Eina_Bool tmp;
    Evas_Event_Mouse_Down *ev = event_info;
    Elm_Gen_Item *it = data;
    Evas_Coord x, y;
@@ -4023,7 +4031,7 @@ _item_mouse_down_cb(void *data,
    sd->movements = 0;
 
    if (_is_no_select(it) ||
-        eo_do((Eo *)eo_it, elm_wdg_item_disabled_get()))
+        eo_do_ret((Eo *)eo_it, tmp, elm_wdg_item_disabled_get()))
      return;
 
    // and finally call the user callbacks.
@@ -4597,6 +4605,7 @@ _item_mouse_up_cb(void *data,
                   Evas_Object *obj EINA_UNUSED,
                   void *event_info)
 {
+   Eina_Bool tmp;
    Evas_Event_Mouse_Up *ev = event_info;
    Eina_Bool dragged = EINA_FALSE;
    Elm_Gen_Item *it = data;
@@ -4695,7 +4704,7 @@ _item_mouse_up_cb(void *data,
      }
 
    if (_is_no_select(it) ||
-       (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()) || (dragged)))
+       (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || (dragged)))
      return;
 
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
@@ -5575,11 +5584,12 @@ _internal_elm_genlist_clear(Evas_Object *obj)
 static Eina_Bool
 _item_select(Elm_Gen_Item *it)
 {
+   Eina_Bool tmp;
    Evas_Object *obj = WIDGET(it);
    ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
    Elm_Object_Item *eo_it = EO_OBJ(it);
 
-   if (eo_do(eo_it, elm_wdg_item_disabled_get())) return EINA_FALSE;
+   if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get())) return EINA_FALSE;
    if (_is_no_select(it) || (it->decorate_it_set)) return EINA_FALSE;
    if ((sd->select_mode != ELM_OBJECT_SELECT_MODE_ALWAYS) &&
        (it->select_mode != ELM_OBJECT_SELECT_MODE_ALWAYS) && it->selected)
@@ -5685,6 +5695,7 @@ _elm_genlist_item_elm_widget_item_part_text_get(Eo *eo_it EINA_UNUSED, Elm_Gen_I
 EOLIAN static void
 _elm_genlist_item_elm_widget_item_disable(Eo *eo_it, Elm_Gen_Item *it)
 {
+   Eina_Bool tmp;
    Eina_List *l;
    Evas_Object *obj;
 
@@ -5695,7 +5706,7 @@ _elm_genlist_item_elm_widget_item_disable(Eo *eo_it, Elm_Gen_Item *it)
 
    if (it->realized)
      {
-        if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()))
+        if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
           {
              edje_object_signal_emit(VIEW(it), SIGNAL_DISABLED, "elm");
              if (it->deco_all_view)
@@ -5710,7 +5721,7 @@ _elm_genlist_item_elm_widget_item_disable(Eo *eo_it, Elm_Gen_Item *it)
                  (it->deco_all_view, SIGNAL_ENABLED, "elm");
           }
         EINA_LIST_FOREACH(it->contents, l, obj)
-          elm_widget_disabled_set(obj, eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()));
+          elm_widget_disabled_set(obj, eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()));
      }
 }
 
@@ -6432,9 +6443,10 @@ EOLIAN static void
 _elm_genlist_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it,
       Eina_Bool selected)
 {
+   Eina_Bool tmp;
    ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
 
-   if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get())) return;
+   if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get())) return;
 
    selected = !!selected;
    if (it->selected == selected) return;
@@ -6936,14 +6948,16 @@ _elm_genlist_item_elm_widget_item_tooltip_style_set(Eo *eo_it, Elm_Gen_Item *it,
 EAPI const char *
 elm_genlist_item_tooltip_style_get(const Elm_Object_Item *it)
 {
-   return eo_do(it, elm_wdg_item_tooltip_style_get());
+   const char *ret;
+   return eo_do_ret(it, ret, elm_wdg_item_tooltip_style_get());
 }
 
 EAPI Eina_Bool
 elm_genlist_item_tooltip_window_mode_set(Elm_Object_Item *item,
                                          Eina_Bool disable)
 {
-   return eo_do(item, elm_wdg_item_tooltip_window_mode_set(disable));
+   Eina_Bool ret;
+   return eo_do_ret(item, ret, elm_wdg_item_tooltip_window_mode_set(disable));
 }
 
 EOLIAN static Eina_Bool
@@ -6954,8 +6968,12 @@ _elm_genlist_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
 
    it->tooltip.free_size = disable;
    if (VIEW(it))
-      return eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS,
-            elm_wdg_item_tooltip_window_mode_set(disable));
+     {
+        Eina_Bool ret;
+        eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS,
+              ret = elm_wdg_item_tooltip_window_mode_set(disable));
+        return ret;
+     }
 
    return EINA_TRUE;
 }
@@ -6964,7 +6982,8 @@ EAPI Eina_Bool
 elm_genlist_item_tooltip_window_mode_get(const Elm_Object_Item *eo_it)
 {
    ELM_GENLIST_ITEM_DATA_GET(eo_it, it);
-   return eo_do(VIEW(it), elm_wdg_item_tooltip_window_mode_get());
+   Eina_Bool ret;
+   return eo_do_ret(VIEW(it), ret, elm_wdg_item_tooltip_window_mode_get());
 }
 
 EAPI void
@@ -6987,7 +7006,8 @@ _elm_genlist_item_elm_widget_item_cursor_set(Eo *eo_it, Elm_Gen_Item *it,
 EAPI const char *
 elm_genlist_item_cursor_get(const Elm_Object_Item *eo_it)
 {
-   return eo_do(eo_it, elm_wdg_item_cursor_get());
+   const char *ret;
+   return eo_do_ret(eo_it, ret, elm_wdg_item_cursor_get());
 }
 
 EAPI void
@@ -7019,7 +7039,8 @@ elm_genlist_item_cursor_style_set(Elm_Object_Item *eo_it,
 EAPI const char *
 elm_genlist_item_cursor_style_get(const Elm_Object_Item *eo_it)
 {
-   return eo_do( eo_it, elm_wdg_item_cursor_style_get());
+   const char *ret;
+   return eo_do_ret(eo_it, ret, elm_wdg_item_cursor_style_get());
 }
 
 EAPI void
@@ -7032,7 +7053,8 @@ elm_genlist_item_cursor_engine_only_set(Elm_Object_Item *eo_it,
 EAPI Eina_Bool
 elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *eo_it)
 {
-   return eo_do( eo_it, elm_wdg_item_cursor_engine_only_get());
+   Eina_Bool ret;
+   return eo_do_ret(eo_it, ret, elm_wdg_item_cursor_engine_only_get());
 }
 
 EOLIAN static int
@@ -7197,12 +7219,13 @@ _elm_genlist_item_decorate_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it,
    Elm_Genlist_Data *sd;
    Eina_List *l;
    Elm_Object_Item *eo_it2 = NULL;
+   Eina_Bool tmp;
 
    ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
    sd = GL_IT(it)->wsd;
 
    if (!decorate_it_type) return;
-   if (eo_do(eo_it, elm_wdg_item_disabled_get())) return;
+   if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get())) return;
    if (sd->decorate_all_mode) return;
 
    if ((sd->mode_item == it) &&
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 6bf4f1bd4..e77564ede 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -1705,7 +1705,8 @@ EOLIAN static void _elm_layout_class_constructor(Eo_Class *klass)
 EAPI Eina_Bool
 elm_layout_file_set(Eo *obj, const char *file, const char *group)
 {
-   return eo_do((Eo *) obj, efl_file_set(file, group));
+   Eina_Bool ret;
+   return eo_do_ret((Eo *) obj, ret, efl_file_set(file, group));
 }
 
 #include "elm_layout.eo.c"
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 282b77fa5..71bf207f7 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -2060,8 +2060,9 @@ EOLIAN static const char *
 _elm_list_item_elm_widget_item_part_text_get(Eo *eo_it, Elm_List_Item_Data *it,
                     const char *part)
 {
+   const char *ret;
    if (part && strcmp(part, "default"))
-     return eo_do(eo_it, elm_wdg_item_part_text_custom_get(part));
+     return eo_do_ret(eo_it, ret, elm_wdg_item_part_text_custom_get(part));
    return it->label;
 }
 
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index b696ecebf..bdee1472b 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -518,8 +518,9 @@ _block_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSE
    Eina_List *items = sd->items;
    EINA_LIST_FOREACH(items, l, eo_current)
      {
+        Eina_Bool tmp;
         ELM_MENU_ITEM_DATA_GET(eo_current, current);
-        if (!current->blocked) current->was_enabled = !eo_do(eo_current, elm_wdg_item_disabled_get());
+        if (!current->blocked) current->was_enabled = !eo_do_ret(eo_current, tmp, elm_wdg_item_disabled_get());
         current->blocked = EINA_TRUE;
         elm_object_item_disabled_set(eo_current, EINA_TRUE);
      }
@@ -908,7 +909,8 @@ _item_clone(Evas_Object *obj,
                                   item->func,
                                   WIDGET_ITEM_DATA_GET(EO_OBJ(item)));
 
-   Eina_Bool disabled = eo_do(eo_item, elm_wdg_item_disabled_get());
+   Eina_Bool disabled;
+   eo_do(eo_item, disabled = elm_wdg_item_disabled_get());
    eo_do(new_item, elm_wdg_item_disabled_set(disabled));
 
    EINA_LIST_FOREACH(item->submenu.items, iter, subitem)
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index 5b19d9870..478b5252c 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -409,7 +409,8 @@ _elm_photo_class_constructor(Eo_Class *klass)
 EAPI Eina_Bool
 elm_photo_file_set(Eo *obj, const char *file)
 {
-   return eo_do((Eo *) obj, efl_file_set(file, NULL));
+   Eina_Bool ret;
+   return eo_do_ret((Eo *) obj, ret, efl_file_set(file, NULL));
 }
 
 #include "elm_photo.eo.c"
diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index 822f7c958..56bcf7f67 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -1872,7 +1872,8 @@ _elm_prefs_class_constructor(Eo_Class *klass)
 EAPI Eina_Bool
 elm_prefs_file_set(Eo *obj, const char *file, const char *page)
 {
-   return eo_do((Eo *) obj, efl_file_set(file, page));
+   Eina_Bool ret;
+   return eo_do_ret((Eo *) obj, ret, efl_file_set(file, page));
 }
 
 EAPI Eina_Bool
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 95fbcf203..c418ced7c 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -417,11 +417,12 @@ _resize_job(void *data)
                        else
                          {
                             Elm_Object_Item *menu_it;
+                            Eina_Bool tmp;
 
                             menu_it = elm_menu_item_add
                                 (menu, NULL, it->icon_str, it->label,
                                 _elm_toolbar_item_menu_cb, it);
-                            Eina_Bool disabled = eo_do(EO_OBJ(it), elm_wdg_item_disabled_get());
+                            Eina_Bool disabled = eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get());
                             eo_do(menu_it, elm_wdg_item_disabled_set(disabled));
                             if (it->o_menu)
                               elm_menu_clone(it->o_menu, menu, menu_it);
@@ -966,9 +967,10 @@ _resize_cb(void *data,
 EOLIAN static void
 _elm_toolbar_item_elm_widget_item_disable(Eo *eo_toolbar, Elm_Toolbar_Item_Data *toolbar_it)
 {
+   Eina_Bool tmp;
    const char* emission;
 
-   if (eo_do(eo_toolbar, elm_wdg_item_disabled_get()))
+   if (eo_do_ret(eo_toolbar, tmp, elm_wdg_item_disabled_get()))
      emission = "elm,state,disabled";
    else
      emission = "elm,state,enabled";
@@ -1033,10 +1035,11 @@ _item_select(Elm_Toolbar_Item_Data *it)
 {
    Evas_Object *obj;
    Eina_Bool sel;
+   Eina_Bool tmp;
 
    ELM_TOOLBAR_DATA_GET(WIDGET(it), sd);
 
-   if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()) || (it->separator) || (it->object))
+   if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || (it->separator) || (it->object))
      return;
    sel = it->selected;
 
@@ -1176,6 +1179,7 @@ _item_theme_hook(Evas_Object *obj,
    Evas_Coord mw = -1, mh = -1;
    Evas_Object *view = VIEW(it);
    const char *style;
+   Eina_Bool tmp;
 
    ELM_TOOLBAR_DATA_GET(obj, sd);
 
@@ -1193,7 +1197,7 @@ _item_theme_hook(Evas_Object *obj,
              if (it->icon)
                elm_widget_signal_emit(it->icon, "elm,state,selected", "elm");
           }
-        if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()))
+        if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
           {
              edje_object_signal_emit(view, "elm,state,disabled", "elm");
              if (it->icon)
@@ -2212,10 +2216,11 @@ static char *
 _access_state_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    Elm_Toolbar_Item_Data *it = (Elm_Toolbar_Item_Data *)data;
+   Eina_Bool tmp;
 
    if (it->separator)
      return strdup(E_("Separator"));
-   else if (eo_do(EO_OBJ(it), elm_wdg_item_disabled_get()))
+   else if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
      return strdup(E_("State: Disabled"));
    else if (it->selected)
      return strdup(E_("State: Selected"));
@@ -2264,8 +2269,9 @@ _access_activate_cb(void *data EINA_UNUSED,
 {
    ELM_TOOLBAR_ITEM_DATA_GET(item, it);
    ELM_TOOLBAR_DATA_GET(WIDGET(it), sd);
+   Eina_Bool tmp;
 
-   if (eo_do(item, elm_wdg_item_disabled_get())) return;
+   if (eo_do_ret(item, tmp, elm_wdg_item_disabled_get())) return;
 
    if (it->selected && (sd->select_mode != ELM_OBJECT_SELECT_MODE_ALWAYS))
      {
@@ -3625,7 +3631,8 @@ _elm_toolbar_item_state_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item
      }
    if (item->icon)
      {
-        if (eo_do(EO_OBJ(item), elm_wdg_item_disabled_get()))
+        Eina_Bool tmp;
+        if (eo_do_ret(EO_OBJ(item), tmp, elm_wdg_item_disabled_get()))
           elm_widget_signal_emit(item->icon, "elm,state,disabled", "elm");
         else
           elm_widget_signal_emit(item->icon, "elm,state,enabled", "elm");
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index b589dd29d..3db858fcd 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -449,7 +449,8 @@ _elm_video_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED
 EAPI Eina_Bool
 elm_video_file_set(Eo *obj, const char *filename)
 {
-   return eo_do((Eo *) obj, efl_file_set(filename, NULL));
+   Eina_Bool ret;
+   return eo_do_ret((Eo *) obj, ret, efl_file_set(filename, NULL));
 }
 
 
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 55673d828..67cddb09f 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -576,7 +576,8 @@ struct _Elm_Widget_Item_Signal_Data
 
 #define WIDGET_ITEM_DATA_GET(eo_obj) \
    ({ \
-    eo_do(eo_obj, eo_key_data_get("__elm_widget_item_data")); \
+    void *_data; \
+    eo_do_ret(eo_obj, _data, eo_key_data_get("__elm_widget_item_data")); \
     })
 
 #define WIDGET_ITEM_DATA_SET(eo_obj, data) \