diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-02-19 16:17:29 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-02-19 16:17:29 +0000 |
| commit | f9bbe3c0f00c66ded939f54fec7c099c19a88f72 (patch) | |
| tree | b4478924fdc64fd3b7d90bf860939c60e30be4c8 | |
| parent | 74ae666f06076e8ebd9bc8267e3b824ef042b0ab (diff) | |
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>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | glib/dbus-glib.c | 8 | ||||
| -rw-r--r-- | glib/dbus-gobject.c | 8 | ||||
| -rw-r--r-- | glib/dbus-gparser.c | 4 |
4 files changed, 22 insertions, 8 deletions
@@ -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 a8708736..7065b668 100644 --- 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 cf10e8d1..af87ffeb 100644 --- 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 3adfe32e..5d6d664a 100644 --- 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, |