From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 28 Dec 2019 15:12:51 +0000 (-0500)
Subject: gtk-demo: Remove menus from listbox demo
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~486^2~30
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b691bc02d9681880c0eaeeb4f713660e5065cef;p=gtk4.git

gtk-demo: Remove menus from listbox demo
---

diff --git a/demos/gtk-demo/listbox.ui b/demos/gtk-demo/listbox.ui
index 5ac7f7ecfa..c5f534c822 100644
--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <object class="GtkMenu" id="menu1">
-    <child>
-      <object class="GtkMenuItem" id="menuitem1">
-        <property name="label" translatable="yes">Email message</property>
-        <property name="use-underline">1</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="menuitem2">
-        <property name="label" translatable="yes">Embed message</property>
-        <property name="use-underline">1</property>
-      </object>
-    </child>
-  </object>
+  <menu id="menu1">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Email message</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Embed message</attribute>
+      </item>
+    </section>
+  </menu>
   <template class="GtkMessageRow" parent="GtkListBoxRow">
     <child>
       <object class="GtkGrid" id="grid1">
@@ -171,7 +167,7 @@
                   <object class="GtkMenuButton" id="more-button">
                     <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
-                    <property name="popup">menu1</property>
+                    <property name="menu-model">menu1</property>
                     <property name="relief">none</property>
                     <property name="label" translatable="yes">More...</property>
                   </object>