dbus/glib dbus-glib.c, 1.4, 1.5 dbus-gobject.c, 1.19, 1.20 dbus-gparser.c, 1.12, 1.13

[Havoc Pennington]

Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv2357/glib

Modified Files:
	dbus-glib.c dbus-gobject.c dbus-gparser.c 
Log Message:
2005-02-19  Havoc Pennington  <hp at redhat.com>

	* glib/dbus-gobject.c
	(_dbus_glib_marshal_dbus_message_to_gvalue_array): add docs

	* glib/dbus-glib.c: fix doxygen warnings

	* glib/dbus-gparser.c (parse_annotation): error if an annotation
	is found on an <arg>



Index: dbus-glib.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-glib.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbus-glib.c	30 Jan 2005 23:06:32 -0000	1.4
+++ dbus-glib.c	19 Feb 2005 16:17:29 -0000	1.5
@@ -50,7 +50,7 @@
 /**
  * Increment refcount on a #DBusGConnection
  * 
- * @param connection the connection to ref
+ * @param gconnection the connection to ref
  * @returns the connection that was ref'd
  */
 DBusGConnection*
@@ -67,7 +67,7 @@
 /**
  * Decrement refcount on a #DBusGConnection
  * 
- * @param connection the connection to unref
+ * @param gconnection the connection to unref
  */
 void
 dbus_g_connection_unref (DBusGConnection *gconnection)
@@ -82,7 +82,7 @@
 /**
  * Increment refcount on a #DBusGMessage
  * 
- * @param message the message to ref
+ * @param gmessage the message to ref
  * @returns the message that was ref'd
  */
 DBusGMessage*
@@ -98,7 +98,7 @@
 /**
  * Decrement refcount on a #DBusGMessage
  * 
- * @param message the message to unref
+ * @param gmessage the message to unref
  */
 void
 dbus_g_message_unref (DBusGMessage *gmessage)

Index: dbus-gobject.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gobject.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dbus-gobject.c	18 Feb 2005 03:14:33 -0000	1.19
+++ dbus-gobject.c	19 Feb 2005 16:17:29 -0000	1.20
@@ -199,8 +199,14 @@
   return method_dir_signature_from_object_info (object, method, FALSE);
 }
 
+/**
+ * Converts the args of a message into an array of GValue.
+ *
+ * @param message the message
+ * @returns #NULL if conversion fails, otherwise the values.
+ */
 GValueArray *
-_dbus_glib_marshal_dbus_message_to_gvalue_array (DBusMessage         *message)
+_dbus_glib_marshal_dbus_message_to_gvalue_array (DBusMessage *message)
 {
   GValueArray *ret;
   DBusMessageIter iter;

Index: dbus-gparser.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gparser.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- dbus-gparser.c	17 Feb 2005 21:11:18 -0000	1.12
+++ dbus-gparser.c	19 Feb 2005 16:17:29 -0000	1.13
@@ -733,7 +733,7 @@
   const char *name;
   const char *value;
   
-  if (!(parser->method || parser->interface || parser->arg) || 
+  if (!(parser->method || parser->interface) || 
       parser->node_stack == NULL ||
       parser->signal ||
       parser->in_annotation)
@@ -753,8 +753,6 @@
                           NULL))
     return FALSE;
 
-  /* name can be null for args */
-  
   if (name == NULL)
     {
       g_set_error (error, G_MARKUP_ERROR,