waaait wait what was I thinking when I agreed to this?

revert obviously wrong 64809+64820 from cedric. SPANK SPANK SPANK

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@64928 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index f158179..9309ce1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,8 +32,3 @@
 2011-11-06  Mike Blumenkrantz
 
         * Add e_notification_image_init for filling in values from an Evas_Object
-
-2011-11-06 Cedric Bail <cedric.bail@free.fr>
-
-       * E_Hal does use some function from E_Ukit, so init it as needed.
-

diff --git a/src/lib/hal/Makefile.am b/src/lib/hal/Makefile.am
index 253f624..f8e78cb 100644 (file)
--- a/src/lib/hal/Makefile.am
+++ b/src/lib/hal/Makefile.am
@@ -2,7 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I $(top_srcdir)/src/lib/dbus \
--I $(top_srcdir)/src/lib/ukit \
 @EDBUS_CFLAGS@
 
 lib_LTLIBRARIES = libehal.la

diff --git a/src/lib/hal/e_hal_main.c b/src/lib/hal/e_hal_main.c
index a70a401..c9d217b 100644 (file)
--- a/src/lib/hal/e_hal_main.c
+++ b/src/lib/hal/e_hal_main.c
@@ -1,5 +1,4 @@
 #include <E_Hal.h>
-#include <E_Ukit.h>
 #include "e_hal_private.h"
 
 int _e_dbus_hal_log_dom = -1;
@@ -27,15 +26,8 @@ e_hal_init(void)
       goto unregister_log_domain;
    }
 
-   if (!e_ukit_init()) {
-      ERR("Could not initialize E_UKit.");
-      goto shutdown_dbus;
-   }
-
    return _e_dbus_hal_init_count;
 
- shutdown_dbus:
-   e_dbus_shutdown();
  unregister_log_domain:
    eina_log_domain_unregister(_e_dbus_hal_log_dom);
    _e_dbus_hal_log_dom = -1;
@@ -51,7 +43,6 @@ e_hal_shutdown(void)
    if (--_e_dbus_hal_init_count != 0)
      return _e_dbus_hal_init_count;
 
-   e_ukit_shutdown();
    e_dbus_shutdown();
 
    eina_log_domain_unregister(_e_dbus_hal_log_dom);