[gtk/gtk-3-24: 1/4] widget-factory: Move app menu contents to primary menu

[Timm Bäder <baedert src gnome org>]

commit 9882bc96387391a6cbb40a1579234c74ee190ad1
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sun Sep 30 20:21:45 2018 -0400

    widget-factory: Move app menu contents to primary menu
    
    GNOME Shell 3.32 will remove support for the app menu
    so we need to move its contents to the primary (hamburger)
    menu.
    
    widget-factory already had a primary menu.
    
    The only item in the app menu was About.
    
    https://gitlab.gnome.org/GNOME/Initiatives/issues/4

 demos/widget-factory/Makefile.am                  |  1 -
 demos/widget-factory/menus.ui                     | 19 -------------------
 demos/widget-factory/widget-factory.gresource.xml |  3 ---
 demos/widget-factory/widget-factory.ui            |  6 ++++++
 4 files changed, 6 insertions(+), 23 deletions(-)
---
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
index a6bfbdc37c..62c156aa09 100644
--- a/demos/widget-factory/Makefile.am
+++ b/demos/widget-factory/Makefile.am
@@ -63,7 +63,6 @@ uninstall-update-icon-cache:
 EXTRA_DIST +=                          \
        widget-factory.ui               \
        widget-factory.css              \
-       menus.ui                        \
        help-overlay.ui                 \
        widget-factory.gresource.xml    \
        data/source.svg                 \
diff --git a/demos/widget-factory/widget-factory.gresource.xml 
b/demos/widget-factory/widget-factory.gresource.xml
index c709f5989c..fb77d0ab71 100644
--- a/demos/widget-factory/widget-factory.gresource.xml
+++ b/demos/widget-factory/widget-factory.gresource.xml
@@ -6,9 +6,6 @@
   <gresource prefix="/org/gtk/WidgetFactory">
     <file>widget-factory.css</file>
   </gresource>
-  <gresource prefix="/org/gtk/WidgetFactory/gtk">
-    <file preprocess="xml-stripblanks">menus.ui</file>
-  </gresource>
   <gresource prefix="/org/gtk/WidgetFactory/gtk">
     <file preprocess="xml-stripblanks">help-overlay.ui</file>
   </gresource>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index ad847df23e..4594d56442 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -16,6 +16,12 @@
         <attribute name="action">win.transition</attribute>
       </item>
     </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">About</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
   </menu>
   <menu id="dinner_menu">
     <section>