diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2012-12-11 12:30:50 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-12-11 12:30:50 +0100 |
| commit | c9244afbdbed972f2fbcfefc6b19b73acdb91a18 (patch) | |
| tree | a8bba42c45002cd1a7517346fabae7892f51fd93 /client/services.c | |
| parent | 11ac62244cedfa8cdb4d6227b471a73db1e7a988 (diff) | |
| download | connman-c9244afbdbed972f2fbcfefc6b19b73acdb91a18.tar.gz connman-c9244afbdbed972f2fbcfefc6b19b73acdb91a18.tar.bz2 connman-c9244afbdbed972f2fbcfefc6b19b73acdb91a18.zip | |
client: Do not include headers from the core
Diffstat (limited to 'client/services.c')
| -rw-r--r-- | client/services.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/client/services.c b/client/services.c index 99b15079..df809114 100644 --- a/client/services.c +++ b/client/services.c @@ -31,8 +31,9 @@ #include <unistd.h> #include <errno.h> +#include <glib.h> + #include "client/services.h" -#include "src/connman.h" #include "dbus.h" static void append_property_array(DBusMessageIter *iter, char *property, @@ -43,7 +44,7 @@ static void append_property_array(DBusMessageIter *iter, char *property, dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &property); - connman_dbus_array_open(iter, &value); + dbus_array_open(iter, &value); dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &array); @@ -66,9 +67,9 @@ static void append_property_dict(DBusMessageIter *iter, char *property, dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &property); /* Top most level is a{sv} */ - connman_dbus_dict_open_variant(iter, &value); + dbus_dict_open_variant(iter, &value); - connman_dbus_dict_open(&value, &dict); + dbus_dict_open(&value, &dict); for (i = 0; i < num_args; i++) { dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY, @@ -103,8 +104,8 @@ static void append_property_dict(DBusMessageIter *iter, char *property, dbus_message_iter_close_container(&dict, &entry); } /* Close {sv}, then close a{sv} */ - connman_dbus_dict_close(&value, &dict); - connman_dbus_dict_close(iter, &value); + dbus_dict_close(&value, &dict); + dbus_dict_close(iter, &value); } void iterate_array(DBusMessageIter *iter) @@ -421,8 +422,8 @@ int set_proxy_manual(DBusConnection *connection, DBusMessage *message, dbus_message_iter_init_append(message_send, &iter); dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &property); - connman_dbus_dict_open_variant(&iter, &value); - connman_dbus_dict_open(&value, &dict); + dbus_dict_open_variant(&iter, &value); + dbus_dict_open(&value, &dict); dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY, NULL, &entry); dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &method); |