summaryrefslogtreecommitdiff
path: root/gtk/gtkbuilder-menus.c
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2012-01-31 00:07:52 -0500
committerRyan Lortie <desrt@desrt.ca>2012-01-31 00:09:11 -0500
commit4041accda33120ce27d71933d4321cd2ac6eb244 (patch)
treef133c7f770cbd461f2b94fa69d4ae9e8e1022bcb /gtk/gtkbuilder-menus.c
parent36242f8035bf87467c5669e775239b8662bba4d3 (diff)
downloadgtk+-4041accda33120ce27d71933d4321cd2ac6eb244.tar.gz
GtkBuilder menus: reject all attributes on <item>
These were just being silently ignored before. That's bad, since it used to be valid to have these.
Diffstat (limited to 'gtk/gtkbuilder-menus.c')
-rw-r--r--gtk/gtkbuilder-menus.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtkbuilder-menus.c b/gtk/gtkbuilder-menus.c
index 5a32a4186c..2bb03587d0 100644
--- a/gtk/gtkbuilder-menus.c
+++ b/gtk/gtkbuilder-menus.c
@@ -106,8 +106,12 @@ gtk_builder_menu_start_element (GMarkupParseContext *context,
{
GMenuItem *item;
- item = g_menu_item_new (NULL, NULL);
- gtk_builder_menu_push_frame (state, NULL, item);
+ if (COLLECT (G_MARKUP_COLLECT_INVALID, NULL))
+ {
+ item = g_menu_item_new (NULL, NULL);
+ gtk_builder_menu_push_frame (state, NULL, item);
+ }
+
return;
}