2005-02-19 Havoc Pennington <hp@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>

diff --git a/ChangeLog b/ChangeLog
index bf719830564fec4e831a92500ad7245d0f3d36ce..e8a8861fcdbf009987e80bba0996ada5a3140c5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-02-19  Havoc Pennington  <hp@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>
+
 2005-02-17  Colin Walters  <walters@verbum.org>
 
        * glib/dbus-gobject.h: Don't export

diff --git a/glib/dbus-glib.c b/glib/dbus-glib.c
index a87087366807ceca69d5e4928d9233c442687679..7065b668316f55277e2c991942955ac4f940f69b 100644 (file)
--- a/glib/dbus-glib.c
+++ b/glib/dbus-glib.c
@@ -50,7 +50,7 @@ dbus_g_connection_flush (DBusGConnection *connection)
 /**
  * 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 @@ dbus_g_connection_ref (DBusGConnection *gconnection)
 /**
  * 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 @@ dbus_g_connection_unref (DBusGConnection *gconnection)
 /**
  * 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 @@ dbus_g_message_ref (DBusGMessage *gmessage)
 /**
  * Decrement refcount on a #DBusGMessage
  * 
- * @param message the message to unref
+ * @param gmessage the message to unref
  */
 void
 dbus_g_message_unref (DBusGMessage *gmessage)

diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c
index cf10e8d12d386b472a12da84d50eb07eefb578e0..af87ffeb97a027b6c2d46ad361c9ad8aa63902c4 100644 (file)
--- a/glib/dbus-gobject.c
+++ b/glib/dbus-gobject.c
@@ -199,8 +199,14 @@ method_output_signature_from_object_info (const DBusGObjectInfo *object,
   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;

diff --git a/glib/dbus-gparser.c b/glib/dbus-gparser.c
index 3adfe32e94428255e01f830b7fd7d1290ec70adb..5d6d664a5f1da654c7821b3da0e592a54a5bc26e 100644 (file)
--- a/glib/dbus-gparser.c
+++ b/glib/dbus-gparser.c
@@ -733,7 +733,7 @@ parse_annotation (Parser      *parser,
   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 @@ parse_annotation (Parser      *parser,
                           NULL))
     return FALSE;
 
-  /* name can be null for args */
-  
   if (name == NULL)
     {
       g_set_error (error, G_MARKUP_ERROR,