[gtk+] GtkBuilder menus: reject all attributes on <item>



commit 4041accda33120ce27d71933d4321cd2ac6eb244
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Jan 31 00:07:52 2012 -0500

    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.

 gtk/gtkbuilder-menus.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkbuilder-menus.c b/gtk/gtkbuilder-menus.c
index 5a32a41..2bb0358 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;
         }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]