From 4c2953f3f042787063dc49088f12a5f2a2dc474f Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 30 Apr 2010 09:07:01 +0000
Subject: [PATCH] beginnings of the ukit migration. this time, in many many
 many small commits along the way to avoid breaking things! :) step 2: migrate
 headers

SVN revision: 48464
---
 src/bin/e.h                        | 4 ++++
 src/bin/e_fm_main.c                | 4 ++++
 src/bin/e_msgbus.c                 | 8 ++++++++
 src/modules/fileman/e_mod_config.c | 2 +-
 src/modules/fileman/e_mod_main.c   | 2 +-
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/bin/e.h b/src/bin/e.h
index bf5097a..62d7dd1 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -92,7 +92,11 @@ void *alloca (size_t);
 #include <Efreet.h>
 #include <Efreet_Mime.h>
 #include <E_DBus.h>
+#ifdef HAVE_EUKIT
+#include <E_Ukit.h>
+#else
 #include <E_Hal.h>
+#endif
 
 #ifdef EAPI
 #undef EAPI
diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c
index f23c96c..dd6b325 100644
--- a/src/bin/e_fm_main.c
+++ b/src/bin/e_fm_main.c
@@ -54,7 +54,11 @@ void *alloca (size_t);
 #include <Efreet.h>
 #include <Eet.h>
 #include <E_DBus.h>
+#ifdef HAVE_EUKIT
+#include <E_Ukit.h>
+#else
 #include <E_Hal.h>
+#endif
 #include <eina_stringshare.h>
 
 #define E_TYPEDEFS
diff --git a/src/bin/e_msgbus.c b/src/bin/e_msgbus.c
index 76d7605..04a8b91 100644
--- a/src/bin/e_msgbus.c
+++ b/src/bin/e_msgbus.c
@@ -30,7 +30,11 @@ e_msgbus_init(void)
    _e_msgbus_data = E_NEW(E_Msgbus_Data, 1);
 
    e_dbus_init();
+#ifdef HAVE_EUKIT
+   e_ukit_init();
+#else
    e_hal_init();
+#endif
 
    _e_msgbus_data->conn = e_dbus_bus_get(DBUS_BUS_SESSION);
    if (!_e_msgbus_data->conn)
@@ -97,7 +101,11 @@ e_msgbus_shutdown(void)
      {
         e_dbus_connection_close(_e_msgbus_data->conn);
      }
+#ifdef HAVE_EUKIT
+   e_ukit_shutdown();
+#else
    e_hal_shutdown();
+#endif
    e_dbus_shutdown();
 
    E_FREE(_e_msgbus_data);
diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c
index 3e5b650..8106af0 100644
--- a/src/modules/fileman/e_mod_config.c
+++ b/src/modules/fileman/e_mod_config.c
@@ -4,7 +4,7 @@
 #include "e.h"
 #include "e_mod_main.h"
 #include "e_mod_config.h"
-#include "e_fm_hal.h"
+#include "e_fm_dbus.h"
 
 struct _E_Config_Dialog_Data 
 {
diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index fae573b..a317c0b 100644
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -2,7 +2,7 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
-#include "e_fm_hal.h"
+#include "e_fm_dbus.h"
 #include "e_mod_main.h"
 #include "e_mod_config.h"
 #include "e_mod_dbus.h"
-- 
2.7.4