From 8f2859a198600575444ea5a308ecec72589f37d2 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 10 Apr 2014 19:06:04 -0400 Subject: [PATCH] fix ibox eo errors --- src/modules/Makefile_ibox.mk | 2 +- src/modules/ibox/e_mod_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/Makefile_ibox.mk b/src/modules/Makefile_ibox.mk index 750a3de45..fbed0220a 100644 --- a/src/modules/Makefile_ibox.mk +++ b/src/modules/Makefile_ibox.mk @@ -10,7 +10,7 @@ iboxpkgdir = $(MDIR)/ibox/$(MODULE_ARCH) iboxpkg_LTLIBRARIES = src/modules/ibox/module.la src_modules_ibox_module_la_LIBADD = $(MOD_LIBS) -src_modules_ibox_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_ibox_module_la_CPPFLAGS = -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT $(MOD_CPPFLAGS) src_modules_ibox_module_la_LDFLAGS = $(MOD_LDFLAGS) src_modules_ibox_module_la_SOURCES = src/modules/ibox/e_mod_main.c \ src/modules/ibox/e_mod_main.h \ diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c index 1150e112a..0953d7890 100644 --- a/src/modules/ibox/e_mod_main.c +++ b/src/modules/ibox/e_mod_main.c @@ -648,11 +648,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) + if (ic->o_icon && eo_isa(ic->o_icon, EDJE_OBJ_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) + if (ic->o_icon2 && eo_isa(ic->o_icon2, EDJE_OBJ_CLASS)) edje_object_signal_emit(ic->o_icon2, sig, src); }