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
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <E_Ukit.h>
#include "e_ukit_private.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <E_Ukit.h>
#include "e_ukit_private.h"
#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)
#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
-#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;
return ret;
}
-
-
-static void
+void
free_property(void *data)
{
E_Ukit_Get_Property_Return *ret = data;
free(ret);
}
-static void *
+void *
unmarshal_device_get_all_properties(DBusMessage *msg, DBusError *err)
{
E_Ukit_Get_All_Properties_Return *ret = NULL;
return ret;
}
-static void
+void
free_device_get_all_properties(void *data)
{
E_Ukit_Get_All_Properties_Return *ret = data;
free(ret);
}
-static void *
+void *
unmarshal_string_list(DBusMessage *msg, DBusError *err)
{
E_Ukit_String_List_Return *ret = NULL;
return ret;
}
-static void
+void
free_string_list(void *data)
{
E_Ukit_String_List_Return *ret = data;
eina_stringshare_del(x);
free(ret);
}
-
-
-#endif
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <E_Ukit.h>
#include "e_ukit_private.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <E_Ukit.h>
#include "e_ukit_private.h"