kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

web: Adjusted to Eo2.

This commit is contained in:
Tom Hacohen 2014-04-03 17:13:49 +01:00
parent dfbffe96de
commit 140f53c05e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/elementary/src/lib/elm_web.c
View File

@ -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;