From 5c1a8e44903bd1dedc8cbefad78b0c8b61daada5 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 12 Aug 2003 02:43:50 +0000 Subject: 2003-08-11 Havoc Pennington * bus/test.c (client_disconnect_handler): change to return HANDLED (would have been REMOVE_MESSAGE) * dbus/dbus-object.h (enum DBusHandlerResult): rename to HANDLED/NOT_YET_HANDLED instead of REMOVE_MESSAGE/ALLOW_MORE_HANDLERS to make it clearer how it should be used. --- dbus/dbus-connection.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dbus/dbus-connection.c') diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index d30ccb0a..17563f35 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -2306,7 +2306,7 @@ dbus_connection_dispatch (DBusConnection *connection) message = message_link->data; - result = DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS; + result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; reply_serial = dbus_message_get_reply_serial (message); reply_handler_data = _dbus_hash_table_lookup_int (connection->pending_replies, @@ -2346,7 +2346,7 @@ dbus_connection_dispatch (DBusConnection *connection) result = _dbus_message_handler_handle_message (handler, connection, message); - if (result != DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS) + if (result != DBUS_HANDLER_RESULT_NOT_YET_HANDLED) break; link = next; @@ -2363,7 +2363,7 @@ dbus_connection_dispatch (DBusConnection *connection) /* FIXME */ ; /* Did a reply we were waiting on get filtered? */ - if (reply_handler_data && result == DBUS_HANDLER_RESULT_REMOVE_MESSAGE) + if (reply_handler_data && result == DBUS_HANDLER_RESULT_HANDLED) { /* Queue the timeout immediately! */ if (reply_handler_data->timeout_link) @@ -2379,7 +2379,7 @@ dbus_connection_dispatch (DBusConnection *connection) } } - if (result == DBUS_HANDLER_RESULT_REMOVE_MESSAGE) + if (result == DBUS_HANDLER_RESULT_HANDLED) goto out; if (reply_handler_data) @@ -2405,7 +2405,7 @@ dbus_connection_dispatch (DBusConnection *connection) message); CONNECTION_LOCK (connection); - if (result == DBUS_HANDLER_RESULT_REMOVE_MESSAGE) + if (result == DBUS_HANDLER_RESULT_HANDLED) goto out; if (result == DBUS_HANDLER_RESULT_NEED_MEMORY) -- cgit