From 51781f541094a4936d47119cd62682e0431c41e9 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 10 Apr 2003 05:12:19 +0000 Subject: 2003-04-10 Havoc Pennington * bus/dispatch.c: lots of fixes * dbus/dbus-mainloop.c (_dbus_loop_dispatch): export (_dbus_loop_iterate): remove old "quit if no callbacks" code, that was crack, broke the test service. * dbus/dbus-transport.c (_dbus_transport_open): fix error handling to avoid piling up errors if we get a failure on the first address. * dbus/dbus-internals.c (_dbus_real_assert_not_reached): include pid in assertion failures. * dbus/dbus-mainloop.c (_dbus_loop_iterate): use static arrays up to some fixed size of file descriptor array. Don't return TRUE anytime a timeout exists, that led to lots of busy loop silliness in the tests. --- bus/connection.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'bus/connection.c') diff --git a/bus/connection.c b/bus/connection.c index aeb4f6e0..80a9ae7a 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -193,7 +193,10 @@ connection_watch_callback (DBusWatch *watch, { DBusConnection *connection = data; dbus_bool_t retval; - + +#if 0 + _dbus_verbose ("Calling handle_watch\n"); +#endif retval = dbus_connection_handle_watch (connection, watch, condition); return retval; @@ -863,7 +866,10 @@ bus_transaction_send_message (BusTransaction *transaction, BusConnectionData *d; DBusList *link; - _dbus_verbose (" trying to add message %s to transaction%s\n", + _dbus_verbose (" trying to add %s %s to transaction%s\n", + dbus_message_get_is_error (message) ? "error" : + dbus_message_get_reply_serial (message) != 0 ? "reply" : + "message", dbus_message_get_name (message), dbus_connection_get_is_connected (connection) ? "" : " (disconnected)"); -- cgit