From 799a3ff443f5357ae7857ebe989a7f92f7bd84df Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 10 Mar 2003 00:13:55 +0000 Subject: 2003-03-10 Anders Carlsson * dbus/dbus-marshal.c: (_dbus_marshal_set_string): Take a length argument so we can marshal the correct string length. (_dbus_marshal_dict), (_dbus_demarshal_dict), (_dbus_marshal_get_arg_end_pos), (_dbus_marshal_validate_arg), (_dbus_marshal_test): * dbus/dbus-marshal.h: Add support for marshalling and demarshalling dicts. * dbus/dbus-message-builder.c: (_dbus_message_data_load): Add support for TYPE DICT. * dbus/dbus-message.c: (set_string_field): Adjust header padding. (dbus_message_append_args_valist), (dbus_message_append_dict), (dbus_message_get_args_valist), (dbus_message_iter_get_arg_type), (dbus_message_iter_get_dict), (_dbus_message_loader_return_buffer), (check_message_handling), (check_have_valid_message): * dbus/dbus-message.h: Add functions for setting and getting dicts. * dbus/dbus-protocol.h: Add DBUS_TYPE_DICT. * dbus/dbus.h: Add dbus-dict.h * doc/dbus-specification.sgml: Add information about how dicts are marshalled. * test/data/invalid-messages/dict-with-nil-value.message: * test/data/invalid-messages/too-short-dict.message: * test/data/valid-messages/dict-simple.message: * test/data/valid-messages/dict.message: Add sample messages containing dicts. --- dbus/dbus-message.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'dbus/dbus-message.h') diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h index bb2b620e..4ea63060 100644 --- a/dbus/dbus-message.h +++ b/dbus/dbus-message.h @@ -28,6 +28,7 @@ #define DBUS_MESSAGE_H #include +#include #include #include @@ -94,7 +95,8 @@ dbus_bool_t dbus_message_append_byte_array (DBusMessage *message, dbus_bool_t dbus_message_append_string_array (DBusMessage *message, const char **value, int len); - +dbus_bool_t dbus_message_append_dict (DBusMessage *message, + DBusDict *dict); DBusMessageIter *dbus_message_get_args_iter (DBusMessage *message); DBusResultCode dbus_message_get_args (DBusMessage *message, @@ -134,6 +136,8 @@ dbus_bool_t dbus_message_iter_get_byte_array (DBusMessageIter *iter, dbus_bool_t dbus_message_iter_get_string_array (DBusMessageIter *iter, char ***value, int *len); +dbus_bool_t dbus_message_iter_get_dict (DBusMessageIter *iter, + DBusDict **dict); DBUS_END_DECLS; -- cgit