GtkIconTheme: fix regression from 0db32f0632ef4675bfcfc9ec201f7af157a48ab0

[~andy/gtk] / gtk / gtkbuilderparser.c

diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 253b4fde1256c4a97e9836707fee4d6f47a7be4f..634425890528f2f76147756c681f7874c04c0545 100644 (file)
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -427,6 +425,14 @@ free_object_info (ObjectInfo *info)
   g_slice_free (ObjectInfo, info);
 }
 
+static void
+free_menu_info (MenuInfo *info)
+{
+  g_free (info->id);
+  g_hash_table_unref (info->objects);
+  g_slice_free (MenuInfo, info);
+}
+
 static void
 parse_child (ParserData   *data,
              const gchar  *element_name,
@@ -635,9 +641,9 @@ _free_signal_info (SignalInfo *info,
   g_slice_free (SignalInfo, info);
 }
 
-void
-_free_requires_info (RequiresInfo *info,
-                    gpointer user_data)
+static void
+free_requires_info (RequiresInfo *info,
+                    gpointer user_data)
 {
   g_free (info->library);
   g_slice_free (RequiresInfo, info);
@@ -824,34 +830,6 @@ parse_custom (GMarkupParseContext *context,
   return TRUE;
 }
 
-static gboolean
-parse_menu (GMarkupParseContext  *context,
-            const gchar          *element_name,
-            const gchar         **names,
-            const gchar         **values,
-            gpointer              user_data,
-            GError              **error)
-{
-  gchar *id;
-  ParserData *data = user_data;
-  ObjectInfo *object_info;
-
-  if (!g_markup_collect_attributes (element_name, names, values, error,
-                                    G_MARKUP_COLLECT_STRING, "id", &id,
-                                    G_MARKUP_COLLECT_INVALID))
-    return FALSE;
-
-  object_info = g_slice_new0 (ObjectInfo);
-  object_info->class_name = g_strdup ("GMenu");
-  object_info->id = g_strdup (id);
-  object_info->tag.name = element_name;
-  state_push (data, object_info);
-
-  g_menu_markup_parser_start_menu (context, data->domain, NULL);
-
-  return TRUE;
-}
-
 static void
 start_element (GMarkupParseContext *context,
                const gchar         *element_name,
@@ -913,7 +891,7 @@ start_element (GMarkupParseContext *context,
   else if (strcmp (element_name, "interface") == 0)
     parse_interface (data, element_name, names, values, error);
   else if (strcmp (element_name, "menu") == 0)
-    parse_menu (context, element_name, names, values, data, error);
+    _gtk_builder_menu_start (data, element_name, names, values, error);
   else if (strcmp (element_name, "placeholder") == 0)
     {
       /* placeholder has no special treatmeant, but it needs an
@@ -980,28 +958,20 @@ end_element (GMarkupParseContext *context,
                         req_info->major, req_info->minor,
                         GTK_MAJOR_VERSION, GTK_MINOR_VERSION);
        }
-      _free_requires_info (req_info, NULL);
+      free_requires_info (req_info, NULL);
     }
   else if (strcmp (element_name, "interface") == 0)
     {
     }
-  else if (strcmp (element_name, "menu") == 0)
-    {
-      ObjectInfo *object_info;
-      GObject *menu;
-
-      object_info = state_pop_info (data, ObjectInfo);
-      menu = (GObject*)g_menu_markup_parser_end_menu (context);
-      _gtk_builder_add_object (data->builder, object_info->id, menu);
-      g_object_unref (menu);
-
-      free_object_info (object_info);
-    }
   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);
@@ -1140,9 +1110,9 @@ free_info (CommonInfo *info)
   else if (strcmp (info->tag.name, "signal") == 0)
     _free_signal_info ((SignalInfo *)info, NULL);
   else if (strcmp (info->tag.name, "requires") == 0)
-    _free_requires_info ((RequiresInfo *)info, NULL);
+    free_requires_info ((RequiresInfo *)info, NULL);
   else if (strcmp (info->tag.name, "menu") == 0)
-    free_object_info ((ObjectInfo *)info);
+    free_menu_info ((MenuInfo *)info);
   else
     g_assert_not_reached ();
 }