summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2017-08-13 09:44:54 +0200
committerDave Andreoli <dave@gurumeditation.it>2017-08-13 09:44:54 +0200
commit1f7548132ec86950098f1567178a7f86ab257797 (patch)
tree3fa0ffd1e990118b231675a046307db655289ea6
parent68c1369c185a1b1c555f40cf1acd12575474cefe (diff)
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.
-rw-r--r--src/e_mod_edgar.c18
1 files 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;
92#define PyString_AsString PyUnicode_AsUTF8 92#define PyString_AsString PyUnicode_AsUTF8
93#endif 93#endif
94 94
95#ifndef EFL_VERSION_1_19
96 #define efl_isa eo_isa
97#endif
98
99#ifndef EFL_VERSION_1_21
100 #define EFL_UI_LAYOUT_CLASS ELM_LAYOUT_CLASS
101#endif
102
95 103
96/*****************************************************************************/ 104/*****************************************************************************/
97/***** Main stuff ***********************************************************/ 105/***** Main stuff ***********************************************************/
@@ -344,18 +352,10 @@ edgar_theme_object_set(Edgar_Py_Gadget *gadget, Evas_Object *obj, const char *gr
344 if (!gadget->edjefile) 352 if (!gadget->edjefile)
345 return EINA_FALSE; 353 return EINA_FALSE;
346 354
347#ifdef EFL_VERSION_1_19
348 if (efl_isa(obj, EDJE_OBJECT_CLASS)) 355 if (efl_isa(obj, EDJE_OBJECT_CLASS))
349#else
350 if (eo_isa(obj, EDJE_OBJECT_CLASS))
351#endif
352 return edje_object_file_set(obj, gadget->edjefile, buf); 356 return edje_object_file_set(obj, gadget->edjefile, buf);
353 357
354#ifdef EFL_VERSION_1_19 358 if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
355 if (efl_isa(obj, ELM_LAYOUT_CLASS))
356#else
357 if (eo_isa(obj, ELM_LAYOUT_CLASS))
358#endif
359 return elm_layout_file_set(obj, gadget->edjefile, buf); 359 return elm_layout_file_set(obj, gadget->edjefile, buf);
360 360
361 return EINA_FALSE; 361 return EINA_FALSE;