From ad3d715a8da076ab52f12b161961db9fdad13b93 Mon Sep 17 00:00:00 2001 From: Patrik Flykt Date: Fri, 26 Apr 2013 13:57:39 +0300 Subject: [PATCH] client: Fix up wrongly included typedef --- client/dbus_helpers.c | 11 +++++++---- client/dbus_helpers.h | 12 ++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/client/dbus_helpers.c b/client/dbus_helpers.c index 2cc6e61..101fa4c 100644 --- a/client/dbus_helpers.c +++ b/client/dbus_helpers.c @@ -277,7 +277,8 @@ int __connmanctl_dbus_set_property_dict(DBusConnection *connection, const char *path, const char *interface, connmanctl_dbus_method_return_func_t cb, void *user_data, const char *property, int type, - connman_dbus_append_cb_t append_fn, void *append_user_data) + connmanctl_dbus_append_func_t append_fn, + void *append_user_data) { DBusMessage *message; DBusMessageIter iter, variant, dict; @@ -314,7 +315,8 @@ int __connmanctl_dbus_set_property_dict(DBusConnection *connection, } static void append_variant_array(DBusMessageIter *iter, const char *property, - connman_dbus_append_cb_t append_fn, void *append_user_data) + connmanctl_dbus_append_func_t append_fn, + void *append_user_data) { DBusMessageIter variant, array; @@ -334,7 +336,7 @@ static void append_variant_array(DBusMessageIter *iter, const char *property, } void __connmanctl_dbus_append_dict_string_array(DBusMessageIter *iter, - const char *property, connman_dbus_append_cb_t append_fn, + const char *property, connmanctl_dbus_append_func_t append_fn, void *append_user_data) { DBusMessageIter dict_entry; @@ -352,7 +354,8 @@ int __connmanctl_dbus_set_property_array(DBusConnection *connection, const char *path, const char *interface, connmanctl_dbus_method_return_func_t cb, void *user_data, const char *property, int type, - connman_dbus_append_cb_t append_fn, void *append_user_data) + connmanctl_dbus_append_func_t append_fn, + void *append_user_data) { DBusMessage *message; DBusMessageIter iter; diff --git a/client/dbus_helpers.h b/client/dbus_helpers.h index f014ac9..cdd92e1 100644 --- a/client/dbus_helpers.h +++ b/client/dbus_helpers.h @@ -24,7 +24,6 @@ #define __CONNMANCTL_DBUS_HELPERS_H #include -#include "../include/dbus.h" #ifdef __cplusplus extern "C" { @@ -45,22 +44,27 @@ int __connmanctl_dbus_set_property(DBusConnection *connection, connmanctl_dbus_method_return_func_t cb, void * user_data, const char *property, int type, void *value); +typedef void (*connmanctl_dbus_append_func_t)(DBusMessageIter *iter, + void *user_data); + void __connmanctl_dbus_append_dict_entry(DBusMessageIter *iter, char *property, int type, void *value); int __connmanctl_dbus_set_property_dict(DBusConnection *connection, const char *path, const char *interface, connmanctl_dbus_method_return_func_t cb, void * user_data, const char *property, int type, - connman_dbus_append_cb_t append_fn, void *append_user_data); + connmanctl_dbus_append_func_t append_fn, + void *append_user_data); void __connmanctl_dbus_append_dict_string_array(DBusMessageIter *iter, - const char *property, connman_dbus_append_cb_t append_fn, + const char *property, connmanctl_dbus_append_func_t append_fn, void *append_user_data); int __connmanctl_dbus_set_property_array(DBusConnection *connection, const char *path, const char *interface, connmanctl_dbus_method_return_func_t cb, void *user_data, const char *property, int type, - connman_dbus_append_cb_t append_fn, void *append_user_data); + connmanctl_dbus_append_func_t append_fn, + void *append_user_data); #ifdef __cplusplus } -- 2.7.4