summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-message.h
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@codefactory.se>2003-01-24 23:34:01 +0000
committerAnders Carlsson <andersca@codefactory.se>2003-01-24 23:34:01 +0000
commitdc6a61a15b2d9cdc6504753fa9eb0a718f99d6d8 (patch)
tree49c51aef2648d20651c44b63071ccfa441ae4f48 /dbus/dbus-message.h
parentc514c719ec52bba3ad359580c989d0944d2f6ffe (diff)
2003-01-25 Anders Carlsson <andersca@codefactory.se>
* dbus/dbus-connection.c: (dbus_connection_send_message): Unlock the message in case it was sent earlier. (dbus_connection_send_message_with_reply_and_block): Remove the reply message from the list. * dbus/dbus-marshal.c: (_dbus_demarshal_string_array): Set array_len and new_pos correctly. (_dbus_marshal_test): Remove debug output. * dbus/dbus-message-internal.h: * dbus/dbus-message.c: (_dbus_message_get_reply_serial): New function that returns the reply serial. (_dbus_message_unlock): New function that unlocks a message and resets its header. (dbus_message_append_string_array), (dbus_message_get_fields_valist), (dbus_message_iter_get_field_type), (dbus_message_iter_get_string_array), (dbus_message_get_fields), (dbus_message_append_fields_valist): Handle string arrays. (dbus_message_set_sender): Make this function public since the bus daemon needs it. (decode_header_data): Set the reply serial to -1 initially. * dbus/dbus-message.h: Add dbus_message_set_sender.
Diffstat (limited to 'dbus/dbus-message.h')
-rw-r--r--dbus/dbus-message.h45
1 files changed, 27 insertions, 18 deletions
diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h
index 7d5ea21b..f5ef9159 100644
--- a/dbus/dbus-message.h
+++ b/dbus/dbus-message.h
@@ -44,26 +44,33 @@ DBusMessage* dbus_message_new_reply (const char *name,
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_service (DBusMessage *message);
+const char* dbus_message_get_name (DBusMessage *message);
+const char* dbus_message_get_service (DBusMessage *message);
+void dbus_message_set_sender (DBusMessage *message,
+ const char *sender);
-dbus_bool_t dbus_message_append_fields (DBusMessage *message,
- int first_field_type,
+
+dbus_bool_t dbus_message_append_fields (DBusMessage *message,
+ int first_field_type,
...);
-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_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);
@@ -86,6 +93,8 @@ 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)