dbus/dbus dbus-connection.c,1.89,1.90 dbus-message.c,1.155,1.156

[Joe Shaw]

Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv13079/dbus

Modified Files:
	dbus-connection.c dbus-message.c 
Log Message:
2005-01-24  Joe Shaw  <joeshaw@novell.com>

	* 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().

Index: dbus-connection.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- dbus-connection.c	17 Jan 2005 00:16:28 -0000	1.89
+++ dbus-connection.c	24 Jan 2005 21:44:35 -0000	1.90
@@ -2740,8 +2740,9 @@
         }
               
       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);

Index: dbus-message.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-message.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- dbus-message.c	24 Jan 2005 05:56:25 -0000	1.155
+++ dbus-message.c	24 Jan 2005 21:44:35 -0000	1.156
@@ -1381,7 +1381,7 @@
                           &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