treeview: fix a critical warning

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

diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index 4c4eadcfdf500022ed41cd2818f2300aab4cdd6c..271054b109cfa90d98391023e10b7c70b3fabaf8 100644 (file)
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -24,9 +24,9 @@
 #include "gtkapplicationprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"
-#include "gtkmodelmenu.h"
 #include "gtkaccelgroup.h"
 #include "gtkaccelmap.h"
+#include "gtkmenubar.h"
 #include "gtkintl.h"
 #include "gtksettings.h"
 
@@ -256,7 +256,7 @@ gtk_application_window_update_menubar (GtkApplicationWindow *window)
       g_menu_append_section (combined, NULL, G_MENU_MODEL (window->priv->app_menu_section));
       g_menu_append_section (combined, NULL, G_MENU_MODEL (window->priv->menubar_section));
 
-      window->priv->menubar = gtk_model_menu_create_menu_bar (G_MENU_MODEL (combined), window->priv->accels);
+      window->priv->menubar = gtk_menu_bar_new_from_model (G_MENU_MODEL (combined));
       gtk_widget_set_parent (window->priv->menubar, GTK_WIDGET (window));
       gtk_widget_show_all (window->priv->menubar);
       g_object_unref (combined);
@@ -471,6 +471,10 @@ add_accel_closure (gpointer         data,
 
       gtk_accel_group_connect_by_path (window->priv->accels, accel_path, &closure->closure);
     }
+  else if (parameter)
+    {
+      g_variant_unref (parameter);
+    }
 
   g_free (action_name);
 }