From 4a85d321b4516c6a663e8bdd530ba59018c974df Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Tue, 21 Jan 2003 09:23:18 +0000 Subject: 2003-01-21 Anders Carlsson * dbus/dbus-connection.c: (dbus_connection_send_message): Add a new client_serial parameter. (dbus_connection_send_message_with_reply): Remove a @todo since we've implemented the blocking function. (dbus_connection_send_message_with_reply_and_block): New function that sends a message and waits for a reply and then returns the reply. * dbus/dbus-connection.h: Add new functions. * dbus/dbus-errors.c: (dbus_result_to_string): * dbus/dbus-errors.h: Add new DBUS_RESULT. * dbus/dbus-message-internal.h: * dbus/dbus-message.c: (_dbus_message_get_reply_serial), (_dbus_message_set_sender), (dbus_message_write_header), (dbus_message_new_reply), (decode_header_data), (_dbus_message_loader_return_buffer), (_dbus_message_test): * dbus/dbus-message.h: Add new functions that set the reply serial and sender. Also marshal and demarshal them correctly and add test. * dbus/dbus-protocol.h: Add new DBUS_MESSAGE_TYPE_SENDER. * glib/dbus-glib.h: * glib/dbus-gmain.c: (watch_callback), (free_callback_data), (add_watch), (remove_watch), (add_timeout), (remove_timeout), (dbus_connection_hookup_with_g_main): * glib/test-dbus-glib.c: (main): Rewrite to use GIOChannel and remove the GSource crack. * test/echo-client.c: (main): * test/watch.c: (check_messages): Update for changed APIs --- dbus/dbus-errors.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dbus/dbus-errors.h') diff --git a/dbus/dbus-errors.h b/dbus/dbus-errors.h index 4dd87677..b1013a60 100644 --- a/dbus/dbus-errors.h +++ b/dbus/dbus-errors.h @@ -50,7 +50,8 @@ typedef enum DBUS_RESULT_NO_NETWORK, /**< Can't find the network */ DBUS_RESULT_ADDRESS_IN_USE, /**< Someone's already using the address */ DBUS_RESULT_DISCONNECTED, /**< No more connection. */ - DBUS_RESULT_INVALID_FIELDS /**< One or more invalid fields encountered. */ + DBUS_RESULT_INVALID_FIELDS, /**< One or more invalid fields encountered. */ + DBUS_RESULT_NO_REPLY, /**< Did not get a reply message. */ } DBusResultCode; void dbus_set_result (DBusResultCode *code_address, -- cgit