[meld/ui-next: 23/35] preferences: Re-save with new glade and fix a few deprecations

[Kai Willadsen <kaiw src gnome org>]

commit 99c51f2dbfe5a9bad443a147bbf11938e78efb68
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Feb 15 09:10:21 2019 +1000

    preferences: Re-save with new glade and fix a few deprecations
    
    All of the vbox/hbox deprecations are manual. There are so many more.

 meld/resources/ui/preferences.ui | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/meld/resources/ui/preferences.ui b/meld/resources/ui/preferences.ui
index 9f352efe..0a788ea7 100644
--- a/meld/resources/ui/preferences.ui
+++ b/meld/resources/ui/preferences.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
     <property name="upper">8</property>
@@ -24,12 +24,14 @@
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="on_response" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="border-width">0</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
             <property name="can_focus">False</property>
@@ -46,15 +48,17 @@
             <property name="can_focus">False</property>
             <property name="show_border">False</property>
             <child>
-              <object class="GtkVBox" id="editor_tab">
+              <object class="GtkBox" id="editor_tab">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">12</property>
                 <child>
-                  <object class="GtkVBox" id="vbox20">
+                  <object class="GtkBox" id="vbox20">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label32">
@@ -74,11 +78,11 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox15">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkLabel" id="label33">
+                          <object class="GtkLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                           </object>
@@ -90,9 +94,10 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkVBox" id="vbox10">
+                          <object class="GtkBox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton_default_font">
@@ -112,7 +117,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox5">
+                              <object class="GtkBox">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="spacing">6</property>