Forgot this.

[platform/upstream/dbus.git] / dbus / dbus-message.h

diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h
index 10fb48a..77213f7 100644 (file)
--- a/dbus/dbus-message.h
+++ b/dbus/dbus-message.h
@@ -36,50 +36,67 @@ DBUS_BEGIN_DECLS;
 typedef struct DBusMessage DBusMessage;
 typedef struct DBusMessageIter DBusMessageIter;
 
-DBusMessage* dbus_message_new   (const char *service,
-                                const char *name);
+DBusMessage* dbus_message_new              (const char        *service,
+                                           const char        *name);
+DBusMessage* dbus_message_new_reply        (const char        *name,
+                                           DBusMessage       *original_message);
+DBusMessage *dbus_message_new_from_message (const DBusMessage *message);
 
 void         dbus_message_ref   (DBusMessage *message);
 void         dbus_message_unref (DBusMessage *message);
 
-const char*  dbus_message_get_name (DBusMessage *message);
+const char* dbus_message_get_name    (DBusMessage *message);
+const char* dbus_message_get_service (DBusMessage *message);
+dbus_bool_t dbus_message_set_sender  (DBusMessage *message,
+                                     const char  *sender);
+const char* dbus_message_get_sender  (DBusMessage *message);
 
-
-dbus_bool_t dbus_message_append_fields        (DBusMessage         *message,
+dbus_bool_t dbus_message_append_fields        (DBusMessage          *message,
+                                              int                   first_field_type,
                                               ...);
-dbus_bool_t dbus_message_append_fields_valist (DBusMessage         *message,
-                                              va_list              var_args);
-dbus_bool_t dbus_message_append_int32         (DBusMessage         *message,
-                                              dbus_int32_t         value);
-dbus_bool_t dbus_message_append_uint32        (DBusMessage         *message,
-                                              dbus_uint32_t        value);
-dbus_bool_t dbus_message_append_double        (DBusMessage         *message,
-                                              double               value);
-dbus_bool_t dbus_message_append_string        (DBusMessage         *message,
-                                              const char          *value);
-dbus_bool_t dbus_message_append_byte_array    (DBusMessage         *message,
-                                              unsigned const char *value,
-                                              int                  len);
+dbus_bool_t dbus_message_append_fields_valist (DBusMessage          *message,
+                                              int                   first_field_type,
+                                              va_list               var_args);
+dbus_bool_t dbus_message_append_int32         (DBusMessage          *message,
+                                              dbus_int32_t          value);
+dbus_bool_t dbus_message_append_uint32        (DBusMessage          *message,
+                                              dbus_uint32_t         value);
+dbus_bool_t dbus_message_append_double        (DBusMessage          *message,
+                                              double                value);
+dbus_bool_t dbus_message_append_string        (DBusMessage          *message,
+                                              const char           *value);
+dbus_bool_t dbus_message_append_byte_array    (DBusMessage          *message,
+                                              unsigned const char  *value,
+                                              int                   len);
+dbus_bool_t dbus_message_append_string_array  (DBusMessage          *message,
+                                              const char          **value,
+                                              int                   len);
+
 
 
 DBusMessageIter *dbus_message_get_fields_iter     (DBusMessage     *message);
+DBusResultCode   dbus_message_get_fields          (DBusMessage     *message,
+                                                  int              first_field_type,
+                                                  ...);
+DBusResultCode  dbus_message_get_fields_valist   (DBusMessage     *message,
+                                                 int              first_field_type,
+                                                 va_list          var_args);
+
+void             dbus_message_iter_ref            (DBusMessageIter *iter);
+void             dbus_message_iter_unref          (DBusMessageIter *iter);
+
+dbus_bool_t      dbus_message_iter_has_next       (DBusMessageIter *iter);
+dbus_bool_t      dbus_message_iter_next           (DBusMessageIter *iter);
+int              dbus_message_iter_get_field_type (DBusMessageIter *iter);
+int              dbus_message_iter_get_int32      (DBusMessageIter *iter);
+int              dbus_message_iter_get_uint32     (DBusMessageIter *iter);
+double           dbus_message_iter_get_double     (DBusMessageIter *iter);
+char *           dbus_message_iter_get_string     (DBusMessageIter *iter);
+unsigned char *  dbus_message_iter_get_byte_array (DBusMessageIter *iter,
+                                                  int             *len);
+char **          dbus_message_iter_get_string_array (DBusMessageIter *iter,
+                                                    int             *len)
 
-dbus_bool_t dbus_message_get_fields          (DBusMessage *message,
-                                             ...);
-dbus_bool_t dbus_message_get_fields_valist   (DBusMessage *message,
-                                             va_list      var_args);
-
-void        dbus_message_iter_ref            (DBusMessageIter *iter);
-void        dbus_message_iter_unref          (DBusMessageIter *iter);
-
-dbus_bool_t dbus_message_iter_has_next      (DBusMessageIter *iter);
-dbus_bool_t dbus_message_iter_next           (DBusMessageIter *iter);
-int         dbus_message_iter_get_field_type (DBusMessageIter *iter);
-int         dbus_message_iter_get_int32      (DBusMessageIter *iter);
-int         dbus_message_iter_get_uint32     (DBusMessageIter *iter);
-double      dbus_message_iter_get_double     (DBusMessageIter *iter);
-char *      dbus_message_iter_get_string     (DBusMessageIter *iter);
-unsigned char *dbus_message_iter_get_byte_array (DBusMessageIter *iter, int *len);