hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=e67a1d1607a846a0b7192cc735990ab35aa145d6
commit e67a1d1607a846a0b7192cc735990ab35aa145d6 Author: Hermet Park <her...@hermet.pe.kr> Date: Tue Mar 8 10:16:04 2016 +0900 Revert "Fix to apply Eo4." This reverts commit b656f774d959a7dfac807f2756869bef3d24a102. Revert this for enventor 0.8.0 release. --- src/lib/edj_viewer.c | 3 ++- src/lib/enventor_smart.c | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c index 0a24dea..2b28701 100644 --- a/src/lib/edj_viewer.c +++ b/src/lib/edj_viewer.c @@ -163,7 +163,8 @@ view_obj_create_post_job(view_data *vd) if (vd->part_name) view_part_highlight_set(vd, vd->part_name); - if (enventor_obj_dummy_parts_get(vd->enventor)) + Eina_Bool ret; + if (eo_do_ret(vd->enventor, ret, enventor_obj_dummy_parts_get())) dummy_obj_new(vd->layout); if (vd->changed_part.part) diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index a5b118c..7b5c3a8 100644 --- a/src/lib/enventor_smart.c +++ b/src/lib/enventor_smart.c @@ -196,7 +196,7 @@ _enventor_object_evas_object_smart_add(Eo *obj, Enventor_Object_Data *pd) pd->obj = obj; elm_widget_sub_object_parent_add(obj); - evas_obj_smart_add(eo_super(obj, MY_CLASS)); + eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); build_init(); autocomp_init(); @@ -288,9 +288,10 @@ EOLIAN static Eo * _enventor_object_eo_base_constructor(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED) { - obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); - evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks); + obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); + eo_do(obj, + evas_obj_type_set(MY_CLASS_NAME_LEGACY), + evas_obj_smart_callbacks_descriptions_set(_smart_callbacks)); return obj; } @@ -758,7 +759,8 @@ enventor_object_add(Evas_Object *parent) EAPI Eina_Bool enventor_object_file_set(Evas_Object *obj, const char *file) { - return efl_file_set(obj, file, NULL); + Eina_Bool ret; + return eo_do_ret(obj, ret, efl_file_set(file, NULL)); } #include "enventor_object.eo.c" --