X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fdbus.c;h=38a6b92feda817279ff8b159973080454748c2d3;hb=0c4159770e177475cb222770f03e0d0ff034f136;hp=884d78a5548fb2231604a8000cdfd1016f37717d;hpb=328d81c6cea8523694ca008e9f08008326f46439;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/dbus.c b/src/dbus.c index 884d78a..38a6b92 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2009 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -104,6 +104,12 @@ void connman_dbus_property_append_basic(DBusMessageIter *iter, case DBUS_TYPE_INT32: signature = DBUS_TYPE_INT32_AS_STRING; break; + case DBUS_TYPE_UINT64: + signature = DBUS_TYPE_UINT64_AS_STRING; + break; + case DBUS_TYPE_INT64: + signature = DBUS_TYPE_INT64_AS_STRING; + break; case DBUS_TYPE_OBJECT_PATH: signature = DBUS_TYPE_OBJECT_PATH_AS_STRING; break; @@ -167,7 +173,7 @@ void connman_dbus_property_append_fixed_array(DBusMessageIter *iter, dbus_message_iter_close_container(iter, &value); } -void connman_dbus_property_append_variable_array(DBusMessageIter *iter, +void connman_dbus_property_append_array(DBusMessageIter *iter, const char *key, int type, connman_dbus_append_cb_t function, void *user_data) { @@ -262,14 +268,126 @@ dbus_bool_t connman_dbus_property_changed_array(const char *path, return FALSE; dbus_message_iter_init_append(signal, &iter); - connman_dbus_property_append_variable_array(&iter, key, type, - function, user_data); + connman_dbus_property_append_array(&iter, key, type, + function, user_data); g_dbus_send_message(connection, signal); return TRUE; } +dbus_bool_t connman_dbus_setting_changed_basic(const char *owner, + const char *path, const char *key, + int type, void *val) +{ + DBusMessage *msg; + DBusMessageIter array, dict; + + if (owner == NULL || path == NULL) + return FALSE; + + msg = dbus_message_new_method_call(owner, path, + CONNMAN_NOTIFICATION_INTERFACE, + "Update"); + if (msg == NULL) + return FALSE; + + dbus_message_iter_init_append(msg, &array); + connman_dbus_dict_open(&array, &dict); + + connman_dbus_dict_append_basic(&dict, key, type, val); + + connman_dbus_dict_close(&array, &dict); + + g_dbus_send_message(connection, msg); + + return TRUE; +} + +dbus_bool_t connman_dbus_setting_changed_dict(const char *owner, + const char *path, const char *key, + connman_dbus_append_cb_t function, + void *user_data) +{ + DBusMessage *msg; + DBusMessageIter array, dict; + + if (owner == NULL || path == NULL) + return FALSE; + + msg = dbus_message_new_method_call(owner, path, + CONNMAN_NOTIFICATION_INTERFACE, + "Update"); + if (msg == NULL) + return FALSE; + + dbus_message_iter_init_append(msg, &array); + connman_dbus_dict_open(&array, &dict); + + connman_dbus_dict_append_dict(&dict, key, function, user_data); + + connman_dbus_dict_close(&array, &dict); + + g_dbus_send_message(connection, msg); + + return TRUE; +} + +dbus_bool_t connman_dbus_setting_changed_array(const char *owner, + const char *path, const char *key, int type, + connman_dbus_append_cb_t function, + void *user_data) +{ + DBusMessage *msg; + DBusMessageIter array, dict; + + if (owner == NULL || path == NULL) + return FALSE; + + msg = dbus_message_new_method_call(owner, path, + CONNMAN_NOTIFICATION_INTERFACE, + "Update"); + if (msg == NULL) + return FALSE; + + dbus_message_iter_init_append(msg, &array); + connman_dbus_dict_open(&array, &dict); + + connman_dbus_dict_append_array(&dict, key, type, function, user_data); + + connman_dbus_dict_close(&array, &dict); + + g_dbus_send_message(connection, msg); + + return TRUE; +} + +dbus_bool_t __connman_dbus_append_objpath_dict_array(DBusMessage *msg, + connman_dbus_append_cb_t function, void *user_data) +{ + DBusMessageIter iter, array; + + if (msg == NULL || function == NULL) + return FALSE; + + dbus_message_iter_init_append(msg, &iter); + dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, + DBUS_STRUCT_BEGIN_CHAR_AS_STRING + DBUS_TYPE_OBJECT_PATH_AS_STRING + DBUS_TYPE_ARRAY_AS_STRING + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + DBUS_TYPE_STRING_AS_STRING + DBUS_TYPE_VARIANT_AS_STRING + DBUS_DICT_ENTRY_END_CHAR_AS_STRING + DBUS_STRUCT_END_CHAR_AS_STRING, &array); + + function(&array, user_data); + + dbus_message_iter_close_container(&iter, &array); + + return TRUE; +} + DBusConnection *connman_dbus_get_connection(void) { if (connection == NULL) @@ -280,6 +398,8 @@ DBusConnection *connman_dbus_get_connection(void) int __connman_dbus_init(DBusConnection *conn) { + DBG(""); + connection = conn; return 0; @@ -287,5 +407,7 @@ int __connman_dbus_init(DBusConnection *conn) void __connman_dbus_cleanup(void) { + DBG(""); + connection = NULL; }