[devhelp] Remove last remnants of the app menu



commit 127ee4a45568c7c73034ac1c84bdbfd925538355
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Jul 9 15:43:58 2021 +0100

    Remove last remnants of the app menu
    
    We don't need it any more, and it's been dropped from GNOME.

 src/dh-app.c         | 15 --------------
 src/dh.gresource.xml |  1 -
 src/menus.ui         | 58 ----------------------------------------------------
 3 files changed, 74 deletions(-)
---
diff --git a/src/dh-app.c b/src/dh-app.c
index eb93cb47..71183073 100644
--- a/src/dh-app.c
+++ b/src/dh-app.c
@@ -347,20 +347,6 @@ setup_accelerators (GtkApplication *app)
         gtk_application_set_accels_for_action (app, "win.focus-search", accels);
 }
 
-static void
-set_app_menu_if_needed (GtkApplication *app)
-{
-        GMenu *manual_app_menu;
-
-        manual_app_menu = gtk_application_get_menu_by_id (app, "manual-app-menu");
-
-        /* Have the g_return in all cases, to catch problems in all cases. */
-        g_return_if_fail (manual_app_menu != NULL);
-
-        if (gtk_application_prefers_app_menu (app))
-                gtk_application_set_app_menu (app, G_MENU_MODEL (manual_app_menu));
-}
-
 static void
 dh_app_startup (GApplication *application)
 {
@@ -373,7 +359,6 @@ dh_app_startup (GApplication *application)
 
         add_action_entries (app);
         setup_accelerators (GTK_APPLICATION (app));
-        set_app_menu_if_needed (GTK_APPLICATION (app));
 }
 
 static void
diff --git a/src/dh.gresource.xml b/src/dh.gresource.xml
index d59c7663..b8d494f0 100644
--- a/src/dh.gresource.xml
+++ b/src/dh.gresource.xml
@@ -15,6 +15,5 @@
   </gresource>
   <gresource prefix="/org/gnome/devhelp/gtk">
     <file preprocess="xml-stripblanks">help-overlay.ui</file>
-    <file preprocess="xml-stripblanks">menus.ui</file>
   </gresource>
 </gresources>


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