From e8d0f9bb14be145370ad0c09002f0f694e13be7a Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Thu, 3 Apr 2014 16:07:36 +0100 Subject: [PATCH] gengrid: Adjusted to Eo2. --- legacy/elementary/src/lib/elm_gengrid.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index 5623d91942..7d4df951b2 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -2181,7 +2181,7 @@ _elm_gengrid_elm_widget_on_focus(Eo *obj, Elm_Gengrid_Data *sd) Elm_Object_Item *it = NULL; Eina_Bool is_sel = EINA_FALSE; - eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret)); + eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus()); if (!int_ret) return EINA_FALSE; if (elm_widget_focus_get(obj) && (sd->selected) && @@ -2280,8 +2280,8 @@ _mirrored_set(Evas_Object *obj, EOLIAN static Eina_Bool _elm_gengrid_elm_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) { - Eina_Bool int_ret; - eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); + Eina_Bool int_ret = EINA_FALSE; + eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply()); if (!int_ret) return EINA_FALSE; _mirrored_set(obj, elm_widget_mirrored_get(obj)); @@ -2844,7 +2844,7 @@ _elm_gengrid_eo_base_constructor(Eo *obj, Elm_Gengrid_Data *sd) eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY), - evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); + evas_obj_smart_callbacks_descriptions_set(_smart_callbacks)); } EOLIAN static void @@ -3866,7 +3866,7 @@ elm_gengrid_nth_item_get(const Evas_Object *obj, unsigned int nth) Eina_Accessor *a; void *data; - ELM_GENGRID_CHECK(obj) EINA_FALSE; + ELM_GENGRID_CHECK(obj) NULL; ELM_GENGRID_DATA_GET(obj, sd); if (!sd->items) return NULL;