From 73b4d050a2508624138c7ec33a0d78a13e8b9d80 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Thu, 3 Apr 2014 17:13:49 +0100 Subject: [PATCH] web: Adjusted to Eo2. --- src/lib/elm_web.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c index 409f932..0e4a0b0 100644 --- a/src/lib/elm_web.c +++ b/src/lib/elm_web.c @@ -111,7 +111,7 @@ _elm_web_elm_widget_theme_apply(Eo *obj, Elm_Web_Data *sd EINA_UNUSED) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); + eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply()); if (!int_ret) return EINA_FALSE; theme = elm_object_theme_get(obj); @@ -151,7 +151,7 @@ _elm_web_elm_widget_on_focus(Eo *obj, Elm_Web_Data *sd) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_TRUE); Eina_Bool int_ret = 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_TRUE; top = elm_widget_top_get(obj); @@ -1173,7 +1173,7 @@ _elm_web_evas_smart_add(Eo *obj, Elm_Web_Data *priv) priv->zoom.current = 1.0; _view_smart_callback_proxy(resize_obj, obj); - eo_do(obj, elm_obj_widget_theme_apply(NULL)); + eo_do(obj, elm_obj_widget_theme_apply()); elm_widget_can_focus_set(obj, EINA_TRUE); #else @@ -1211,7 +1211,7 @@ _elm_web_eo_base_constructor(Eo *obj, Elm_Web_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(_elm_web_smart_callbacks, NULL)); + evas_obj_smart_callbacks_descriptions_set(_elm_web_smart_callbacks)); } EOLIAN static Evas_Object* @@ -1363,7 +1363,7 @@ elm_web_uri_set(Evas_Object *obj, #ifdef HAVE_ELEMENTARY_WEB ELM_WEB_CHECK(obj) EINA_FALSE; Eina_Bool ret = EINA_FALSE; - eo_do(obj, elm_obj_web_url_set(url, &ret)); + eo_do(obj, ret = elm_obj_web_url_set(url)); return ret; #else (void)obj; -- 2.7.4