From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 27 Dec 2019 04:49:26 +0000 (-0500)
Subject: applicationwindow: Stop using a menu bar
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~486^2~43
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0cf1e1e106a9510f7cab96a650a57900119fe2d5;p=gtk4.git

applicationwindow: Stop using a menu bar

We have a replacement with popovers now.
---

diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index bd6a58de8c..63e31713cd 100644
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -25,7 +25,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"
 #include "gtkheaderbar.h"
-#include "gtkmenubar.h"
+#include "gtkpopovermenubar.h"
 #include "gtkintl.h"
 #include "gtksettings.h"
 #include "gtkshortcutswindowprivate.h"
@@ -70,7 +70,7 @@
  * will display the application menu, but not the menubar.
  *
  * If the desktop environment does not display the menubar, then
- * #GtkApplicationWindow will automatically show a #GtkMenuBar for it.
+ * #GtkApplicationWindow will automatically show a menubar for it.
  * This behaviour can be overridden with the #GtkApplicationWindow:show-menubar
  * property. If the desktop environment does not display the application
  * menu, then it will automatically be included in the menubar or in the
@@ -273,7 +273,7 @@ gtk_application_window_update_menubar (GtkApplicationWindow *window)
       g_menu_append_section (combined, NULL, G_MENU_MODEL (priv->app_menu_section));
       g_menu_append_section (combined, NULL, G_MENU_MODEL (priv->menubar_section));
 
-      priv->menubar = gtk_menu_bar_new_from_model (G_MENU_MODEL (combined));
+      priv->menubar = gtk_popover_menu_bar_new_from_model (G_MENU_MODEL (combined));
       gtk_widget_set_parent (priv->menubar, GTK_WIDGET (window));
       g_object_unref (combined);
     }