raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=7fe18a69546359d7db9355efbbd529a9475468e9
commit 7fe18a69546359d7db9355efbbd529a9475468e9 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Tue Jul 1 08:37:33 2014 +0900 unbreak enlightenment compile due to eo usage so e is using eo... and something in eo changes... and e fails to compile entirely.... there are hacks to use eo... and this is not good. eo is still in a beta state. that means any usage of it can (and will) break. this is a problem for e. if e uses eo, then eo breaks in an efl upgrade, e breaks. we can't really have that. we already hit this problem in terminology with the app server code in elm. so let's just not use eo in e until it's stable. this removes eo usage in all places, with the e_menu code having a small isedje() func due to some of its code paths doing special things based on if the obj is an edje one or not as opposed to just a simple "only emit if its an edje obj". --- src/bin/e.h | 5 ----- src/bin/e_fm.c | 3 +-- src/bin/e_menu.c | 46 +++++++++++++++++++++++++------------------ src/modules/ibox/e_mod_main.c | 4 ++-- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/bin/e.h b/src/bin/e.h index dfd3678..e430a5a 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -119,11 +119,6 @@ void *alloca (size_t); # include <Emotion.h> # include <Elementary.h> -/* FIXME: remove this hack at some point */ -# ifndef EDJE_CLASS -# define EDJE_CLASS EDJE_OBJECT_CLASS -#endif - # ifdef HAVE_HAL # include <E_Hal.h> # endif diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 3196751..7cfc99c 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -7660,8 +7660,7 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU _e_fm2_cb_icon_thumb_dnd_gen, o, 1); edje_object_signal_emit(o, "e,state,selected", "e"); - if (eo_isa(o2, EDJE_CLASS)) - edje_object_signal_emit(o2, "e,state,selected", "e"); + edje_object_signal_emit(o2, "e,state,selected", "e"); edje_object_signal_emit(o, "e,state,move", "e"); if (layout) { diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 127bf24..a96c7ae 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -724,6 +724,14 @@ e_menu_item_label_set(E_Menu_Item *mi, const char *label) mi->menu->changed = 1; } +static Eina_Bool +isedje(Evas_Object *obj) +{ + if (!obj) return EINA_FALSE; + if (edje_object_play_get(obj)) return EINA_TRUE; + return EINA_FALSE; +} + EAPI void e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub) { @@ -749,7 +757,7 @@ e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub) { if (mi->submenu_object) { - if (eo_isa(mi->submenu_object, EDJE_CLASS)) + if (isedje(mi->submenu_object)) { /* already have a correct submenu object, don't re-set it */ _e_menu_lock = EINA_FALSE; @@ -879,11 +887,11 @@ e_menu_item_toggle_set(E_Menu_Item *mi, int tog) edje_object_signal_emit(mi->bg_object, "e,state,on", "e"); if (mi->icon_bg_object) edje_object_signal_emit(mi->icon_bg_object, "e,state,on", "e"); - if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS)) + if (isedje(mi->label_object)) edje_object_signal_emit(mi->label_object, "e,state,on", "e"); - if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS)) + if (isedje(mi->submenu_object)) edje_object_signal_emit(mi->submenu_object, "e,state,on", "e"); - if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS)) + if (isedje(mi->toggle_object)) edje_object_signal_emit(mi->toggle_object, "e,state,on", "e"); if (mi->menu->bg_object) edje_object_signal_emit(mi->menu->bg_object, "e,state,on", "e"); @@ -895,11 +903,11 @@ e_menu_item_toggle_set(E_Menu_Item *mi, int tog) edje_object_signal_emit(mi->bg_object, "e,state,off", "e"); if (mi->icon_bg_object) edje_object_signal_emit(mi->icon_bg_object, "e,state,off", "e"); - if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS)) + if (isedje(mi->label_object)) edje_object_signal_emit(mi->label_object, "e,state,off", "e"); - if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS)) + if (isedje(mi->submenu_object)) edje_object_signal_emit(mi->submenu_object, "e,state,off", "e"); - if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS)) + if (isedje(mi->toggle_object)) edje_object_signal_emit(mi->toggle_object, "e,state,off", "e"); if (mi->menu->bg_object) edje_object_signal_emit(mi->menu->bg_object, "e,state,off", "e"); @@ -1009,17 +1017,17 @@ e_menu_item_active_set(E_Menu_Item *mi, int active) edje_object_signal_emit(mi->bg_object, "e,state,selected", "e"); if (mi->icon_bg_object) edje_object_signal_emit(mi->icon_bg_object, "e,state,selected", "e"); - if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS)) + if (isedje(mi->label_object)) edje_object_signal_emit(mi->label_object, "e,state,selected", "e"); - if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS)) + if (isedje(mi->submenu_object)) edje_object_signal_emit(mi->submenu_object, "e,state,selected", "e"); - if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS)) + if (isedje(mi->toggle_object)) edje_object_signal_emit(mi->toggle_object, "e,state,selected", "e"); if (mi->icon_key) { if (mi->icon_object) { - if (eo_isa(mi->icon_object, EDJE_CLASS)) + if (isedje(mi->icon_object)) edje_object_signal_emit(mi->icon_object, "e,state,selected", "e"); else e_icon_selected_set(mi->icon_object, EINA_TRUE); @@ -1038,17 +1046,17 @@ e_menu_item_active_set(E_Menu_Item *mi, int active) edje_object_signal_emit(mi->bg_object, "e,state,unselected", "e"); if (mi->icon_bg_object) edje_object_signal_emit(mi->icon_bg_object, "e,state,unselected", "e"); - if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS)) + if (isedje(mi->label_object)) edje_object_signal_emit(mi->label_object, "e,state,unselected", "e"); - if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS)) + if (isedje(mi->submenu_object)) edje_object_signal_emit(mi->submenu_object, "e,state,unselected", "e"); - if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS)) + if (isedje(mi->toggle_object)) edje_object_signal_emit(mi->toggle_object, "e,state,unselected", "e"); if (mi->icon_key) { if (mi->icon_object) { - if (eo_isa(mi->icon_object, EDJE_CLASS)) + if (isedje(mi->icon_object)) edje_object_signal_emit(mi->icon_object, "e,state,unselected", "e"); else e_icon_selected_set(mi->icon_object, EINA_FALSE); @@ -1084,9 +1092,9 @@ e_menu_item_disabled_set(E_Menu_Item *mi, int disable) mi->disable = 1; if (mi->icon_bg_object) edje_object_signal_emit(mi->icon_bg_object, "e,state,disable", "e"); - if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS)) + if (isedje(mi->label_object)) edje_object_signal_emit(mi->label_object, "e,state,disable", "e"); - if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS)) + if (isedje(mi->toggle_object)) edje_object_signal_emit(mi->toggle_object, "e,state,disable", "e"); } else @@ -1094,9 +1102,9 @@ e_menu_item_disabled_set(E_Menu_Item *mi, int disable) mi->disable = 0; if (mi->icon_bg_object) edje_object_signal_emit(mi->icon_bg_object, "e,state,enable", "e"); - if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS)) + if (isedje(mi->label_object)) edje_object_signal_emit(mi->label_object, "e,state,enable", "e"); - if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS)) + if (isedje(mi->toggle_object)) edje_object_signal_emit(mi->toggle_object, "e,state,enable", "e"); } } diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c index 33c2231..b7818c6 100644 --- a/src/modules/ibox/e_mod_main.c +++ b/src/modules/ibox/e_mod_main.c @@ -649,11 +649,11 @@ _ibox_icon_signal_emit(IBox_Icon *ic, char *sig, char *src) { if (ic->o_holder) edje_object_signal_emit(ic->o_holder, sig, src); - if (ic->o_icon && eo_isa(ic->o_icon, EDJE_CLASS)) + if (ic->o_icon) edje_object_signal_emit(ic->o_icon, sig, src); if (ic->o_holder2) edje_object_signal_emit(ic->o_holder2, sig, src); - if (ic->o_icon2 && eo_isa(ic->o_icon2, EDJE_CLASS)) + if (ic->o_icon2) edje_object_signal_emit(ic->o_icon2, sig, src); } --
