client: Pretty-print D-Bus signed integers

[platform/upstream/connman.git] / client / dbus_helpers.h

diff --git a/client/dbus_helpers.h b/client/dbus_helpers.h
index f014ac9..9fc2164 100644 (file)
--- a/client/dbus_helpers.h
+++ b/client/dbus_helpers.h
@@ -24,43 +24,52 @@
 #define __CONNMANCTL_DBUS_HELPERS_H
 
 #include <dbus/dbus.h>
-#include "../include/dbus.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define CONNMAN_SERVICE   "net.connman"
+#define CONNMAN_PATH      "/"
+#define VPN_SERVICE       CONNMAN_SERVICE ".vpn"
+#define VPN_PATH          "/"
+
 void __connmanctl_dbus_print(DBusMessageIter *iter, const char *pre,
                const char *dict, const char *sep);
 
-typedef void (*connmanctl_dbus_method_return_func_t)(DBusMessageIter *iter,
+typedef int (*connmanctl_dbus_method_return_func_t)(DBusMessageIter *iter,
                const char *error, void *user_data);
-int __connmanctl_dbus_method_call(DBusConnection *connection, const char *path,
-               const char *interface, const char *method,
-               connmanctl_dbus_method_return_func_t cb, void * user_data,
-               int arg1, ...);
+int __connmanctl_dbus_method_call(DBusConnection *connection,
+               const char *service, const char *path, const char *interface,
+               const char *method, connmanctl_dbus_method_return_func_t cb,
+               void * user_data, int arg1, ...);
 
 int __connmanctl_dbus_set_property(DBusConnection *connection,
                const char *path, const char *interface,
                connmanctl_dbus_method_return_func_t cb, void * user_data,
                const char *property, int type, void *value);
 
-void __connmanctl_dbus_append_dict_entry(DBusMessageIter *iter, 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,
+               const 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
 }