kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a widget toolkit should NOT, I repeat, should NOT, depend on HAL. especially when no HAL functionality is used. 

SVN revision: 55961
This commit is contained in:
Mike Blumenkrantz 2011-01-06 23:09:56 +00:00
parent 640754ae71
commit a45ea59ca3
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/elementary/configure.ac
View File

@ -330,13 +330,12 @@ if test "x$want_elementary_edbus" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_EDBUS],
[
edbus >= 1.0.0
ehal >= 1.0.0
],
[
AC_DEFINE(HAVE_ELEMENTARY_EDBUS, 1, [EDBus support for Elementary])
have_elementary_edbus="yes"
ELM_EDBUS_DEF="#define"
requirement_elm="ehal >= 1.0.0 edbus >= 1.0.0 ${requirement_elm}"
requirement_elm="edbus >= 1.0.0 ${requirement_elm}"
],
[have_elementary_edbus="no"]
)
@ -344,7 +343,7 @@ else
have_elementary_edbus="no"
fi
if test "x$want_elementary_edbus" = "xyes" -a "x$have_elementary_edbus" = "xno"; then
AC_MSG_ERROR([E_DBus support requested, but no edbus/ehal found by pkg-config.])
AC_MSG_ERROR([E_DBus support requested, but no e_dbus found by pkg-config.])
fi
AC_SUBST(ELM_EDBUS_DEF)

1
legacy/elementary/src/lib/Elementary.h.in
View File

@ -75,7 +75,6 @@
#ifdef ELM_EDBUS
# include <E_DBus.h>
# include <E_Hal.h>
#endif
#ifdef ELM_EFREET

2
legacy/elementary/src/lib/elm_main.c
View File

@ -374,7 +374,6 @@ elm_need_e_dbus(void)
#ifdef ELM_EDBUS
if (_elm_need_e_dbus++) return EINA_TRUE;
e_dbus_init();
e_hal_init();
return EINA_TRUE;
#else
return EINA_FALSE;
@ -388,7 +387,6 @@ _elm_unneed_e_dbus(void)
if (--_elm_need_e_dbus) return;
_elm_need_e_dbus = 0;
e_hal_shutdown();
e_dbus_shutdown();
#endif
}