discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=67855482fcd641312f0e3b1061d7cb98dc76dca3
commit 67855482fcd641312f0e3b1061d7cb98dc76dca3
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Wed Jun 4 09:28:17 2014 -0400
update eo class names, add hack for 1.10 class name compat
---
src/bin/e.h | 9 +++++----
src/bin/e_menu.c | 39 +++++++++++++++++++--------------------
src/modules/ibox/e_mod_main.c | 4 ++--
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/bin/e.h b/src/bin/e.h
index 7fbc1cd..1a743fd 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -119,6 +119,11 @@ void *alloca (size_t);
# include <Emotion.h>
# include <Elementary.h>
+/* FIXME: remove this hack at some point */
+# ifndef EDJE_CLASS
+# define EDJE_CLASS EDJE_OBJ_CLASS
+#endif
+
# ifdef HAVE_HAL
# include <E_Hal.h>
# endif
@@ -182,10 +187,6 @@ typedef struct _E_Rect E_Rect;
# define MAX(x, y) (((x) > (y)) ? (x) : (y))
#endif
-#if (EINA_VERSION_MAJOR == 1) && (EINA_VERSION_MINOR < 8)
-# define eina_list_last_data_get(X) eina_list_data_get(eina_list_last(X))
-#endif
-
# define E_FREE_FUNC(_h, _fn) do { if (_h) { _fn((void*)_h); _h = NULL; } }
while (0)
# define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) \
(((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) &&
(((y) + (h)) > (yy)))
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index fd87262..3947f52 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -1,5 +1,4 @@
#include "e.h"
-#include <Eo.h>
/* TODO List:
*
@@ -750,7 +749,7 @@ e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub)
{
if (mi->submenu_object)
{
- if (eo_isa(mi->submenu_object, EDJE_OBJ_CLASS))
+ if (eo_isa(mi->submenu_object, EDJE_CLASS))
{
/* already have a correct submenu object, don't re-set it */
_e_menu_lock = EINA_FALSE;
@@ -880,11 +879,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_OBJ_CLASS))
+ if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,on", "e");
- if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_OBJ_CLASS))
+ if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS))
edje_object_signal_emit(mi->submenu_object, "e,state,on", "e");
- if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS))
+ if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
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");
@@ -896,11 +895,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_OBJ_CLASS))
+ if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,off", "e");
- if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_OBJ_CLASS))
+ if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS))
edje_object_signal_emit(mi->submenu_object, "e,state,off", "e");
- if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS))
+ if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
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");
@@ -1010,17 +1009,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_OBJ_CLASS))
+ if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,selected", "e");
- if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_OBJ_CLASS))
+ if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS))
edje_object_signal_emit(mi->submenu_object, "e,state,selected", "e");
- if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS))
+ if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
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_OBJ_CLASS))
+ if (eo_isa(mi->icon_object, EDJE_CLASS))
edje_object_signal_emit(mi->icon_object,
"e,state,selected", "e");
else
e_icon_selected_set(mi->icon_object, EINA_TRUE);
@@ -1039,17 +1038,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_OBJ_CLASS))
+ if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,unselected", "e");
- if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_OBJ_CLASS))
+ if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS))
edje_object_signal_emit(mi->submenu_object, "e,state,unselected",
"e");
- if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS))
+ if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
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_OBJ_CLASS))
+ if (eo_isa(mi->icon_object, EDJE_CLASS))
edje_object_signal_emit(mi->icon_object,
"e,state,unselected", "e");
else
e_icon_selected_set(mi->icon_object, EINA_FALSE);
@@ -1085,9 +1084,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_OBJ_CLASS))
+ if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,disable", "e");
- if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS))
+ if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,disable", "e");
}
else
@@ -1095,9 +1094,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_OBJ_CLASS))
+ if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,enable", "e");
- if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS))
+ if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
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 4504572..33c2231 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_OBJ_CLASS))
+ if (ic->o_icon && eo_isa(ic->o_icon, EDJE_CLASS))
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_OBJ_CLASS))
+ if (ic->o_icon2 && eo_isa(ic->o_icon2, EDJE_CLASS))
edje_object_signal_emit(ic->o_icon2, sig, src);
}
--
