dbus.h: Update include/dbus.h with more container support

[platform/upstream/connman.git] / include / dbus.h

diff --git a/include/dbus.h b/include/dbus.h
index 9be76b2..bf5f8c1 100644 (file)
--- a/include/dbus.h
+++ b/include/dbus.h
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  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
@@ -39,11 +39,13 @@ extern "C" {
 #define CONNMAN_MANAGER_INTERFACE      CONNMAN_SERVICE ".Manager"
 #define CONNMAN_MANAGER_PATH           "/"
 
+#define CONNMAN_CLOCK_INTERFACE                CONNMAN_SERVICE ".Clock"
 #define CONNMAN_TASK_INTERFACE         CONNMAN_SERVICE ".Task"
-#define CONNMAN_PROFILE_INTERFACE      CONNMAN_SERVICE ".Profile"
 #define CONNMAN_SERVICE_INTERFACE      CONNMAN_SERVICE ".Service"
 #define CONNMAN_PROVIDER_INTERFACE     CONNMAN_SERVICE ".Provider"
 #define CONNMAN_TECHNOLOGY_INTERFACE   CONNMAN_SERVICE ".Technology"
+#define CONNMAN_SESSION_INTERFACE      CONNMAN_SERVICE ".Session"
+#define CONNMAN_NOTIFICATION_INTERFACE CONNMAN_SERVICE ".Notification"
 
 #define CONNMAN_PRIVILEGE_MODIFY       1
 #define CONNMAN_PRIVILEGE_SECRET       2
@@ -73,6 +75,18 @@ dbus_bool_t connman_dbus_property_changed_array(const char *path,
                        const char *interface, const char *key, int type,
                        connman_dbus_append_cb_t function, void *user_data);
 
+dbus_bool_t connman_dbus_setting_changed_basic(const char *owner,
+                               const char *path, const char *key,
+                               int type, void *val);
+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);
+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);
+
 static inline void connman_dbus_dict_open(DBusMessageIter *iter,
                                                        DBusMessageIter *dict)
 {
@@ -82,6 +96,25 @@ static inline void connman_dbus_dict_open(DBusMessageIter *iter,
                        DBUS_DICT_ENTRY_END_CHAR_AS_STRING, dict);
 }
 
+static inline void connman_dbus_dict_open_variant(DBusMessageIter *iter,
+                                                       DBusMessageIter *dict)
+{
+       dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
+                       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, dict);
+}
+
+static inline void connman_dbus_array_open(DBusMessageIter *iter,
+                                                       DBusMessageIter *dict)
+{
+       dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
+                       DBUS_TYPE_ARRAY_AS_STRING
+                       DBUS_TYPE_STRING_AS_STRING,
+                       dict);
+}
+
 static inline void connman_dbus_dict_close(DBusMessageIter *iter,
                                                        DBusMessageIter *dict)
 {