summaryrefslogtreecommitdiffstats
path: root/glib/dbus-gparser.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2005-02-19 16:17:29 +0000
committerHavoc Pennington <hp@redhat.com>2005-02-19 16:17:29 +0000
commitf9bbe3c0f00c66ded939f54fec7c099c19a88f72 (patch)
treeb4478924fdc64fd3b7d90bf860939c60e30be4c8 /glib/dbus-gparser.c
parent74ae666f06076e8ebd9bc8267e3b824ef042b0ab (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>
Diffstat (limited to 'glib/dbus-gparser.c')
-rw-r--r--glib/dbus-gparser.c4
1 files changed, 1 insertions, 3 deletions
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,