summaryrefslogtreecommitdiff
path: root/bus/connection.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-04-10 05:12:19 +0000
committerHavoc Pennington <hp@redhat.com>2003-04-10 05:12:19 +0000
commit51781f541094a4936d47119cd62682e0431c41e9 (patch)
treed551d4ed8147fd12a73a86ea3febd95608fff491 /bus/connection.c
parent49f6e320d790e168ccec040ad47b787c32107bde (diff)
downloaddbus-51781f541094a4936d47119cd62682e0431c41e9.tar.gz
2003-04-10 Havoc Pennington <hp@pobox.com>
* 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.
Diffstat (limited to 'bus/connection.c')
-rw-r--r--bus/connection.c10
1 files changed, 8 insertions, 2 deletions
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)");