From 98ad8a8ec6626f7f5c78915b6bdf2be688b4839f Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 30 Jan 2005 07:44:08 +0000 Subject: 2005-01-30 Havoc Pennington * glib/dbus-gobject.c (introspect_properties): fix the XML generated * dbus/dbus-message.c (dbus_message_unref): add an in_cache flag which effectively detects the use of freed messages * glib/dbus-gobject.c (handle_introspect): modify and return the reply message instead of the incoming message * dbus/dbus-object-tree.c (handle_default_introspect_unlocked): gee, maybe it should SEND THE XML instead of just making a string and freeing it again ;-) * tools/dbus-print-message.c (print_message): improve printing of messages * configure.in: add debug-glib.service to the output --- dbus/dbus-connection.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'dbus/dbus-connection.c') diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 90d7c38b..f01133c5 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -357,7 +357,7 @@ _dbus_connection_queue_received_message_link (DBusConnection *connection, _dbus_connection_wakeup_mainloop (connection); - _dbus_verbose ("Message %p (%d %s %s '%s') added to incoming queue %p, %d incoming\n", + _dbus_verbose ("Message %p (%d %s %s '%s' reply to %u) added to incoming queue %p, %d incoming\n", message, dbus_message_get_type (message), dbus_message_get_interface (message) ? @@ -367,6 +367,7 @@ _dbus_connection_queue_received_message_link (DBusConnection *connection, dbus_message_get_member (message) : "no member", dbus_message_get_signature (message), + dbus_message_get_reply_serial (message), connection, connection->n_incoming); } @@ -1562,7 +1563,7 @@ _dbus_connection_send_preallocated_unlocked (DBusConnection *connection, sig = dbus_message_get_signature (message); - _dbus_verbose ("Message %p (%d %s %s '%s') added to outgoing queue %p, %d pending to send\n", + _dbus_verbose ("Message %p (%d %s %s '%s') for %s added to outgoing queue %p, %d pending to send\n", message, dbus_message_get_type (message), dbus_message_get_interface (message) ? @@ -1572,6 +1573,9 @@ _dbus_connection_send_preallocated_unlocked (DBusConnection *connection, dbus_message_get_member (message) : "no member", sig, + dbus_message_get_destination (message) ? + dbus_message_get_destination (message) : + "null", connection, connection->n_outgoing); @@ -1587,6 +1591,9 @@ _dbus_connection_send_preallocated_unlocked (DBusConnection *connection, if (client_serial) *client_serial = dbus_message_get_serial (message); } + + _dbus_verbose ("Message %p serial is %u\n", + message, dbus_message_get_serial (message)); _dbus_message_lock (message); @@ -1638,7 +1645,7 @@ dbus_connection_send_preallocated (DBusConnection *connection, CONNECTION_UNLOCK (connection); } -static dbus_bool_t +dbus_bool_t _dbus_connection_send_unlocked (DBusConnection *connection, DBusMessage *message, dbus_uint32_t *client_serial) -- cgit