davemds pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/edgar.git/commit/?id=1f7548132ec86950098f1567178a7f86ab257797
commit 1f7548132ec86950098f1567178a7f86ab257797 Author: Dave Andreoli <[email protected]> Date: Sun Aug 13 09:44:54 2017 +0200 Fix for efl 1.21 changes note: efl in git still does not provide EFL_VERSION_1_21, so this is still broken for you. --- src/e_mod_edgar.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/e_mod_edgar.c b/src/e_mod_edgar.c index abebe8b..04dc177 100644 --- a/src/e_mod_edgar.c +++ b/src/e_mod_edgar.c @@ -92,6 +92,14 @@ static PyObject *edjeEdjeType; #define PyString_AsString PyUnicode_AsUTF8 #endif +#ifndef EFL_VERSION_1_19 + #define efl_isa eo_isa +#endif + +#ifndef EFL_VERSION_1_21 + #define EFL_UI_LAYOUT_CLASS ELM_LAYOUT_CLASS +#endif + /*****************************************************************************/ /***** Main stuff ***********************************************************/ @@ -344,18 +352,10 @@ edgar_theme_object_set(Edgar_Py_Gadget *gadget, Evas_Object *obj, const char *gr if (!gadget->edjefile) return EINA_FALSE; -#ifdef EFL_VERSION_1_19 if (efl_isa(obj, EDJE_OBJECT_CLASS)) -#else - if (eo_isa(obj, EDJE_OBJECT_CLASS)) -#endif return edje_object_file_set(obj, gadget->edjefile, buf); -#ifdef EFL_VERSION_1_19 - if (efl_isa(obj, ELM_LAYOUT_CLASS)) -#else - if (eo_isa(obj, ELM_LAYOUT_CLASS)) -#endif + if (efl_isa(obj, EFL_UI_LAYOUT_CLASS)) return elm_layout_file_set(obj, gadget->edjefile, buf); return EINA_FALSE; --
