From 737479031f51b00020b6020f8780137bb4a3de1b Mon Sep 17 00:00:00 2001 From: Joe Shaw Date: Mon, 24 Jan 2005 21:44:35 +0000 Subject: 2005-01-24 Joe Shaw * dbus/dbus-connection.c (dbus_connection_dispatch): Print out the signature for the method that can't be found. * dbus/dbus-message.c (dbus_message_iter_init): To check to see if the message has any arguments, we need to call _dbus_type_reader_get_current_type(), not _dbus_type_reader_has_next(). --- ChangeLog | 10 ++++++++++ dbus/dbus-connection.c | 3 ++- dbus/dbus-message.c | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index aad79745..bac52fca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-01-24 Joe Shaw + + * dbus/dbus-connection.c (dbus_connection_dispatch): Print out the + signature for the method that can't be found. + + * dbus/dbus-message.c (dbus_message_iter_init): To check to see if + the message has any arguments, we need to call + _dbus_type_reader_get_current_type(), not + _dbus_type_reader_has_next(). + 2005-01-24 Havoc Pennington * dbus/dbus-message-factory.c: more testing of message validation diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index d338b786..90d7c38b 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -2740,8 +2740,9 @@ dbus_connection_dispatch (DBusConnection *connection) } if (!_dbus_string_append_printf (&str, - "Method \"%s\" on interface \"%s\" doesn't exist\n", + "Method \"%s\" with signature \"%s\" on interface \"%s\" doesn't exist\n", dbus_message_get_member (message), + dbus_message_get_signature (message), dbus_message_get_interface (message))) { _dbus_string_free (&str); diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index 750d2344..cf15109b 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -1381,7 +1381,7 @@ dbus_message_iter_init (DBusMessage *message, &message->body, 0); - return _dbus_type_reader_has_next (&real->u.reader); + return _dbus_type_reader_get_current_type (&real->u.reader) != DBUS_TYPE_INVALID; } #ifndef DBUS_DISABLE_CHECKS -- cgit