AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 19:00:08 +00:00
Code Issues Projects Releases Wiki Activity

builderparser: Shuffle if-statements around once more

Browse Source 
The previous reordering broke the builderparser test case.
This commit is contained in:
Timm Bäder 2017-01-08 13:07:12 +01:00
parent f00ccd3259
commit c392f41bb2
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkbuilderparser.c
View File

@ -967,22 +967,22 @@ start_element (GMarkupParseContext *context,
return; return;
} }
if (strcmp (element_name, "property") == 0) if (strcmp (element_name, "object") == 0)
parse_property (data, element_name, names, values, error);
else if (strcmp (element_name, "object") == 0)
parse_object (context, data, element_name, names, values, error); parse_object (context, data, element_name, names, values, error);
else if (strcmp (element_name, "child") == 0)
parse_child (data, element_name, names, values, error);
else if (strcmp (element_name, "signal") == 0)
parse_signal (data, element_name, names, values, error);
else if (strcmp (element_name, "requires") == 0)
parse_requires (data, element_name, names, values, error);
else if (strcmp (element_name, "template") == 0)
parse_template (context, data, element_name, names, values, error);
else if (data->requested_objects && !data->inside_requested_object) else if (data->requested_objects && !data->inside_requested_object)
{ {
/* If outside a requested object, simply ignore this tag */ /* If outside a requested object, simply ignore this tag */
} }
else if (strcmp (element_name, "property") == 0)
parse_property (data, element_name, names, values, error);
else if (strcmp (element_name, "child") == 0)
parse_child (data, element_name, names, values, error);
else if (strcmp (element_name, "signal") == 0)
parse_signal (data, element_name, names, values, error);
else if (strcmp (element_name, "template") == 0)
parse_template (context, data, element_name, names, values, error);
else if (strcmp (element_name, "requires") == 0)
parse_requires (data, element_name, names, values, error);
else if (strcmp (element_name, "interface") == 0) else if (strcmp (element_name, "interface") == 0)
parse_interface (data, element_name, names, values, error); parse_interface (data, element_name, names, values, error);
else if (strcmp (element_name, "menu") == 0) else if (strcmp (element_name, "menu") == 0)
@ -1028,7 +1028,11 @@ end_element (GMarkupParseContext *context,
return; return;
} }
if (strcmp (element_name, "property") == 0) if (data->requested_objects && !data->inside_requested_object)
{
/* If outside a requested object, simply ignore this tag */
}
else if (strcmp (element_name, "property") == 0)
{ {
PropertyInfo *prop_info = state_pop_info (data, PropertyInfo); PropertyInfo *prop_info = state_pop_info (data, PropertyInfo);
CommonInfo *info = state_peek_info (data, CommonInfo); CommonInfo *info = state_peek_info (data, CommonInfo);
@ -1135,10 +1139,6 @@ end_element (GMarkupParseContext *context,
else if (strcmp (element_name, "interface") == 0) else if (strcmp (element_name, "interface") == 0)
{ {
} }
else if (data->requested_objects && !data->inside_requested_object)
{
/* If outside a requested object, simply ignore this tag */
}
else if (strcmp (element_name, "menu") == 0) else if (strcmp (element_name, "menu") == 0)
{ {
_gtk_builder_menu_end (data); _gtk_builder_menu_end (data);