From 6b050a277eb61a85162f5b17fcc44280847943f6 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 27 Mar 2019 20:03:59 -0400
Subject: [PATCH] Convert ui files

Run gtk4-builder-tool simplify --3to4 over all ui files.
---
 demos/gtk-demo/theming.ui              | 48 +++++++-------------------
 demos/widget-factory/widget-factory.ui |  6 +---
 2 files changed, 13 insertions(+), 41 deletions(-)

diff --git a/demos/gtk-demo/theming.ui b/demos/gtk-demo/theming.ui
index dfcb83f77a..58fea83495 100644
--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -11,41 +11,36 @@
         </style>
         <child>
           <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Normal</property>
             <property name="use-underline">1</property>
             <property name="is-important">1</property>
             <property name="icon-name">edit-find</property>
           </object>
-          <packing>
-            <property name="homogeneous">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Active</property>
             <property name="use-underline">1</property>
             <property name="is-important">1</property>
             <property name="icon-name">edit-find</property>
             <property name="active">1</property>
           </object>
-          <packing>
-            <property name="homogeneous">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive</property>
             <property name="use-underline">1</property>
             <property name="is-important">1</property>
             <property name="icon-name">edit-find</property>
           </object>
-          <packing>
-            <property name="homogeneous">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Raised</property>
             <property name="use-underline">1</property>
             <property name="is-important">1</property>
@@ -54,12 +49,10 @@
               <class name="raised"/>
             </style>
           </object>
-          <packing>
-            <property name="homogeneous">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Raised Active</property>
             <property name="use-underline">1</property>
             <property name="is-important">1</property>
@@ -69,12 +62,10 @@
               <class name="raised"/>
             </style>
           </object>
-          <packing>
-            <property name="homogeneous">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive Active</property>
             <property name="use-underline">1</property>
@@ -82,9 +73,6 @@
             <property name="is-important">1</property>
             <property name="active">1</property>
           </object>
-          <packing>
-            <property name="homogeneous">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToolItem">
@@ -149,68 +137,56 @@
         </style>
         <child>
           <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Normal</property>
             <property name="use-underline">1</property>
             <property name="icon-name">list-add-symbolic</property>
           </object>
-          <packing>
-            <property name="homogeneous">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Normal</property>
             <property name="use-underline">1</property>
             <property name="icon-name">list-add-symbolic</property>
           </object>
-          <packing>
-            <property name="homogeneous">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Active</property>
             <property name="use-underline">1</property>
             <property name="icon-name">list-remove-symbolic</property>
             <property name="active">1</property>
           </object>
-          <packing>
-            <property name="homogeneous">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
             <property name="label" translatable="yes">Active</property>
             <property name="use-underline">1</property>
             <property name="icon-name">list-remove-symbolic</property>
             <property name="active">1</property>
           </object>
-          <packing>
-            <property name="homogeneous">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive</property>
             <property name="use-underline">1</property>
             <property name="icon-name">edit-find-symbolic</property>
           </object>
-          <packing>
-            <property name="homogeneous">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
             <property name="sensitive">0</property>
             <property name="label" translatable="yes">Insensitive Active</property>
             <property name="use-underline">1</property>
             <property name="icon-name">go-up-symbolic</property>
             <property name="active">1</property>
           </object>
-          <packing>
-            <property name="homogeneous">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 54384ef057..67377698e7 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -417,7 +417,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
             <property name="menu-model">gear_menu</property>
             <property name="icon-name">open-menu-symbolic</property>
           </object>
-          <packing/>
         </child>
       </object>
     </child>
@@ -1593,7 +1592,6 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="valign">center</property>
                                             <property name="icon-name">emblem-system-symbolic</property>
                                           </object>
-                                          <packing/>
                                         </child>
                                       </object>
                                     </child>
@@ -2844,6 +2842,7 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                                 <child>
                                   <object class="GtkToolItem">
+                                    <property name="expand-item">1</property>
                                     <child>
                                       <object class="GtkScale">
                                         <property name="draw-value">0</property>
@@ -2851,9 +2850,6 @@ microphone-sensitivity-medium-symbolic</property>
                                       </object>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">1</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkToolItem">