[gtk+] Fix a cornercase of menu parsing



commit aa3d30e2560d60677f5bfdeb05c4bbbfc840fcfa
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Apr 20 01:50:01 2012 -0400

    Fix a cornercase of menu parsing
    
    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

 gtk/gtkbuilderparser.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index c6490ad..59c0721 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -963,15 +963,15 @@ end_element (GMarkupParseContext *context,
   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)
     {
       /* If outside a requested object, simply ignore this tag */
       return;
     }
+  else if (strcmp (element_name, "menu") == 0)
+    {
+      _gtk_builder_menu_end (data);
+    }
   else if (strcmp (element_name, "object") == 0)
     {
       ObjectInfo *object_info = state_pop_info (data, ObjectInfo);



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