AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a cornercase of menu parsing

Browse Source 
When a uimanager in a gtkbuilder file contains a menu,
the builder parser was getting confused.

https://bugzilla.gnome.org/show_bug.cgi?id=672789
This commit is contained in:
Matthias Clasen 2012-04-20 01:50:01 -04:00
parent ffafe80f5b
commit aa3d30e256
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkbuilderparser.c
View File

@ -963,15 +963,15 @@ end_element (GMarkupParseContext *context,
else if (strcmp (element_name, "interface") == 0) else if (strcmp (element_name, "interface") == 0)
{ {
} }
else if (strcmp (element_name, "menu") == 0)
{
_gtk_builder_menu_end (data);
}
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 */
return; return;
} }
else if (strcmp (element_name, "menu") == 0)
{
_gtk_builder_menu_end (data);
}
else if (strcmp (element_name, "object") == 0) else if (strcmp (element_name, "object") == 0)
{ {
ObjectInfo *object_info = state_pop_info (data, ObjectInfo); ObjectInfo *object_info = state_pop_info (data, ObjectInfo);