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
devs/princeamd/enlightenment-0.17-elive
Mike Blumenkrantz 13 years ago
parent 5c598d1a78
commit 4c2953f3f0
  1. 4
      src/bin/e.h
  2. 4
      src/bin/e_fm_main.c
  3. 8
      src/bin/e_msgbus.c
  4. 2
      src/modules/fileman/e_mod_config.c
  5. 2
      src/modules/fileman/e_mod_main.c

@ -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

@ -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

@ -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);

@ -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
{

@ -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"

Loading…
Cancel
Save