Commit f4893870 authored by Matthias Clasen's avatar Matthias Clasen

Don't assert on misplaced signal elements

svn path=/trunk/; revision=18977
parent c3fcd42e
2007-11-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbuilderparser.c (parse_signal): Handle misplaced
signal elements without asserting.
* gtk/gtkbuilderparser.c (parse_property): Handle misplaced
property elements without asserting.
......
......@@ -297,7 +297,6 @@ parse_object (ParserData *data,
object_info->id = object_id;
object_info->constructor = constructor;
state_push (data, object_info);
g_assert (state_peek (data) != NULL);
object_info->tag.name = element_name;
if (child_info)
......@@ -341,7 +340,6 @@ parse_child (ParserData *data,
child_info = g_slice_new0 (ChildInfo);
state_push (data, child_info);
g_assert (state_peek (data) != NULL);
child_info->tag.name = element_name;
for (i = 0; names[i]; i++)
{
......@@ -450,7 +448,11 @@ parse_signal (ParserData *data,
gboolean swapped_set = FALSE;
int i;
g_assert (data->stack != NULL);
if (data->stack == NULL)
{
error_invalid_tag (data, "signal", NULL, error);
return;
}
for (i = 0; names[i] != NULL; i++)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment