fix properly the e_ukit_privfunc.h functions thingy and improve a bit Makefile.am

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

diff --git a/src/lib/ukit/Makefile.am b/src/lib/ukit/Makefile.am
index c0b441a..77dcb5a 100644 (file)
--- a/src/lib/ukit/Makefile.am
+++ b/src/lib/ukit/Makefile.am
@@ -9,19 +9,18 @@ if BUILD_EUKIT
 lib_LTLIBRARIES = libeukit.la
 include_HEADERS = E_Ukit.h
 
-noinst_HEADERS = e_ukit_private.h e_ukit_privfunc.h
-
 libeukit_la_SOURCES = \
-E_Ukit.h \
 e_udisks.c  \
 e_upower.c  \
 e_ukit_util.c \
-e_ukit_main.c
+e_ukit_main.c \
+e_ukit_private_util.c
 
 libeukit_la_LIBADD = \
-@EDBUS_LIBS@ \
 $(top_builddir)/src/lib/dbus/libedbus.la \
 @EINA_LIBS@
 libeukit_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @eukit_release_info@
 
 endif
+
+EXTRA_DIST = e_ukit_private.h
\ No newline at end of file

diff --git a/src/lib/ukit/e_udisks.c b/src/lib/ukit/e_udisks.c
index 556a943..70363f8 100644 (file)
--- a/src/lib/ukit/e_udisks.c
+++ b/src/lib/ukit/e_udisks.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <E_Ukit.h>
 #include "e_ukit_private.h"
 

diff --git a/src/lib/ukit/e_ukit_main.c b/src/lib/ukit/e_ukit_main.c
index 46126f7..c541e3d 100644 (file)
--- a/src/lib/ukit/e_ukit_main.c
+++ b/src/lib/ukit/e_ukit_main.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <E_Ukit.h>
 #include "e_ukit_private.h"
 

diff --git a/src/lib/ukit/e_ukit_private.h b/src/lib/ukit/e_ukit_private.h
index 58b5973..c4763de 100644 (file)
--- a/src/lib/ukit/e_ukit_private.h
+++ b/src/lib/ukit/e_ukit_private.h
@@ -2,20 +2,25 @@
 #define E_UKIT_PRIVATE_H
 
 #ifndef E_DBUS_COLOR_DEFAULT
-#define E_DBUS_COLOR_DEFAULT EINA_COLOR_CYAN
+# define E_DBUS_COLOR_DEFAULT EINA_COLOR_CYAN
 #endif
+
 extern int _e_dbus_ukit_log_dom;
+
 #ifdef ERR
-#undef ERR
+# undef ERR
 #endif
+
 #ifdef INF
-#undef INF
+# undef INF
 #endif
+
 #ifdef WARN
-#undef WARN
+# undef WARN
 #endif
+
 #ifdef DBG
-#undef DBG
+# undef DBG
 #endif
 
 #define e_ukit_call_new(udi, member) dbus_message_new_method_call(E_UKIT_BUS, udi, E_UKIT_BUS, member)
@@ -27,6 +32,12 @@ extern int _e_dbus_ukit_log_dom;
 #define WARN(...) EINA_LOG_DOM_WARN(_e_dbus_ukit_log_dom, __VA_ARGS__)
 #define ERR(...)   EINA_LOG_DOM_ERR(_e_dbus_ukit_log_dom, __VA_ARGS__)
 
-#include "e_ukit_privfunc.h"
+void *unmarshal_property(DBusMessage *msg, DBusError *err);
+void  free_property(void *data);
+void *unmarshal_device_get_all_properties(DBusMessage *msg, DBusError *err);
+void  free_device_get_all_properties(void *data);
+void *unmarshal_string_list(DBusMessage *msg, DBusError *err);
+void  free_string_list(void *data);
+
 
 #endif

diff --git a/src/lib/ukit/e_ukit_privfunc.h b/src/lib/ukit/e_ukit_private_util.c
similarity index 98%
rename from src/lib/ukit/e_ukit_privfunc.h
rename to src/lib/ukit/e_ukit_private_util.c
index dd27ad3..1d14605 100644 (file)
--- a/src/lib/ukit/e_ukit_privfunc.h
+++ b/src/lib/ukit/e_ukit_private_util.c
@@ -1,8 +1,11 @@
-#ifndef E_UKIT_PRIVFUNC_H
-#define E_UKIT_PRIVFUNC_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
+#include <E_Ukit.h>
+#include "e_ukit_private.h"
 
-static void *
+void *
 unmarshal_property(DBusMessage *msg, DBusError *err)
 {
    E_Ukit_Get_Property_Return *ret = NULL;
@@ -78,9 +81,7 @@ unmarshal_property(DBusMessage *msg, DBusError *err)
    return ret;
 }
 
-
-
-static void 
+void 
 free_property(void *data)
 {
    E_Ukit_Get_Property_Return *ret = data;
@@ -97,7 +98,7 @@ free_property(void *data)
    free(ret);
 }
 
-static void *
+void *
 unmarshal_device_get_all_properties(DBusMessage *msg, DBusError *err)
 {
    E_Ukit_Get_All_Properties_Return *ret = NULL;
@@ -192,7 +193,7 @@ unmarshal_device_get_all_properties(DBusMessage *msg, DBusError *err)
    return ret;
 }
 
-static void
+void
 free_device_get_all_properties(void *data)
 {
    E_Ukit_Get_All_Properties_Return *ret = data;
@@ -202,7 +203,7 @@ free_device_get_all_properties(void *data)
    free(ret);
 }
 
-static void *
+void *
 unmarshal_string_list(DBusMessage *msg, DBusError *err)
 {
    E_Ukit_String_List_Return *ret = NULL;
@@ -240,7 +241,7 @@ unmarshal_string_list(DBusMessage *msg, DBusError *err)
    return ret;
 }
 
-static void
+void
 free_string_list(void *data)
 {
    E_Ukit_String_List_Return *ret = data;
@@ -251,6 +252,3 @@ free_string_list(void *data)
      eina_stringshare_del(x);
    free(ret);
 }
-
-
-#endif

diff --git a/src/lib/ukit/e_ukit_util.c b/src/lib/ukit/e_ukit_util.c
index 48900b1..3067b75 100644 (file)
--- a/src/lib/ukit/e_ukit_util.c
+++ b/src/lib/ukit/e_ukit_util.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <E_Ukit.h>
 #include "e_ukit_private.h"
 

diff --git a/src/lib/ukit/e_upower.c b/src/lib/ukit/e_upower.c
index a7c0278..af6de36 100644 (file)
--- a/src/lib/ukit/e_upower.c
+++ b/src/lib/ukit/e_upower.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <E_Ukit.h>
 #include "e_ukit_private.h"