a widget toolkit should NOT, I repeat, should NOT, depend on HAL. especially when...

SVN revision: 55961

diff --git a/configure.ac b/configure.ac
index ea729f3b6ec4d8787340ddaaec2f034136ad0dc1..9ca0e67747afe1388865c24702f1056faf7d3e4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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)
 

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index f546fc177a8717c0c68dc414f97f5a978b65d76a..0cb25743d8fdff53aacaf1b81782afa9357d1b34 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -75,7 +75,6 @@
 
 #ifdef ELM_EDBUS
 # include <E_DBus.h>
-# include <E_Hal.h>
 #endif
 
 #ifdef ELM_EFREET

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index ef20b61184e3003f2239cf02518ef8e93317774c..6237ec8b9757ee89a92a65b258ffe97c7b5155d3 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -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
 }