glade: replace GtkHBox and GtkVBox with GtkBox

Both long deprecated.

29 files changed, 172 insertions, 86 deletions

diff --git a/src/8021x.ui b/src/8021x.ui
index 8a723c28..eda17229 100644
--- a/src/8021x.ui
+++ b/src/8021x.ui
@@ -66,7 +66,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox1">
+          <object class="GtkBox" id="hbox1">
+            <property name="orientation">horizontal</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_start">5</property>
@@ -89,7 +90,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox1">
+              <object class="GtkBox" id="vbox1">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
@@ -141,7 +143,8 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkVBox" id="security_vbox">
+                      <object class="GtkBox" id="security_vbox">
+                        <property name="orientation">vertical</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
diff --git a/src/connection-editor/ce-ip4-routes.ui b/src/connection-editor/ce-ip4-routes.ui
index 623c60e6..6cc0aa5e 100644
--- a/src/connection-editor/ce-ip4-routes.ui
+++ b/src/connection-editor/ce-ip4-routes.ui
@@ -62,7 +62,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox2">
+          <object class="GtkBox" id="vbox2">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_start">5</property>
@@ -71,7 +72,8 @@
             <property name="margin_bottom">5</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkHBox" id="hbox5">
+              <object class="GtkBox" id="hbox5">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
diff --git a/src/connection-editor/ce-ip6-routes.ui b/src/connection-editor/ce-ip6-routes.ui
index 78f961ce..beec17da 100644
--- a/src/connection-editor/ce-ip6-routes.ui
+++ b/src/connection-editor/ce-ip6-routes.ui
@@ -62,7 +62,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox2">
+          <object class="GtkBox" id="vbox2">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_start">5</property>
@@ -71,7 +72,8 @@
             <property name="margin_bottom">5</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkHBox" id="hbox5">
+              <object class="GtkBox" id="hbox5">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
diff --git a/src/connection-editor/ce-new-connection.ui b/src/connection-editor/ce-new-connection.ui
index 9720ee63..4f809a31 100644
--- a/src/connection-editor/ce-new-connection.ui
+++ b/src/connection-editor/ce-new-connection.ui
@@ -84,7 +84,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox2">
+          <object class="GtkBox" id="hbox2">
+            <property name="orientation">horizontal</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_start">5</property>
@@ -107,7 +108,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox3">
+              <object class="GtkBox" id="vbox3">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">12</property>
@@ -146,7 +148,8 @@ If you are creating a VPN, and the VPN connection you wish to create does not ap
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="new_connection_vbox">
+                  <object class="GtkBox" id="new_connection_vbox">
+                    <property name="orientation">vertical</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
diff --git a/src/connection-editor/ce-page-bond.ui b/src/connection-editor/ce-page-bond.ui
index e3500621..258f2cb8 100644
--- a/src/connection-editor/ce-page-bond.ui
+++ b/src/connection-editor/ce-page-bond.ui
@@ -130,7 +130,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="hbox2">
+      <object class="GtkBox" id="hbox2">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">10</property>
@@ -245,7 +246,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="hbox1">
+      <object class="GtkBox" id="hbox1">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">4</property>
@@ -393,7 +395,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="bond_updelay_box">
+      <object class="GtkBox" id="bond_updelay_box">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">4</property>
@@ -432,7 +435,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="bond_downdelay_box">
+      <object class="GtkBox" id="bond_downdelay_box">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">4</property>
@@ -511,7 +515,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="bond_mtu_box">
+      <object class="GtkBox" id="bond_mtu_box">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">4</property>
diff --git a/src/connection-editor/ce-page-bridge.ui b/src/connection-editor/ce-page-bridge.ui
index 5e7c5d6d..24e70b50 100644
--- a/src/connection-editor/ce-page-bridge.ui
+++ b/src/connection-editor/ce-page-bridge.ui
@@ -70,7 +70,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="hbox2">
+      <object class="GtkBox" id="hbox2">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">10</property>
@@ -239,7 +240,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="bridge_forward_delay_box">
+      <object class="GtkBox" id="bridge_forward_delay_box">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">4</property>
@@ -280,7 +282,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="bridge_hello_time_box">
+      <object class="GtkBox" id="bridge_hello_time_box">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">4</property>
@@ -383,7 +386,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="bridge_max_age_box">
+      <object class="GtkBox" id="bridge_max_age_box">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">4</property>
@@ -438,7 +442,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="bridge_ageing_time_box">
+      <object class="GtkBox" id="bridge_ageing_time_box">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">4</property>
diff --git a/src/connection-editor/ce-page-ethernet.ui b/src/connection-editor/ce-page-ethernet.ui
index 4df7b21f..9d4e7c6a 100644
--- a/src/connection-editor/ce-page-ethernet.ui
+++ b/src/connection-editor/ce-page-ethernet.ui
@@ -136,7 +136,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="ethernet_device_vbox">
+      <object class="GtkBox" id="ethernet_device_vbox">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
@@ -195,7 +196,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="hbox1">
+      <object class="GtkBox" id="hbox1">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui
index b15d4ae8..75b10765 100644
--- a/src/connection-editor/ce-page-general.ui
+++ b/src/connection-editor/ce-page-general.ui
@@ -103,7 +103,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="firewall_zone_vbox">
+      <object class="GtkBox" id="firewall_zone_vbox">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="hexpand">True</property>
diff --git a/src/connection-editor/ce-page-infiniband.ui b/src/connection-editor/ce-page-infiniband.ui
index 77b2e4de..7c1eadcf 100644
--- a/src/connection-editor/ce-page-infiniband.ui
+++ b/src/connection-editor/ce-page-infiniband.ui
@@ -57,7 +57,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="infiniband_device_vbox">
+      <object class="GtkBox" id="infiniband_device_vbox">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
@@ -88,7 +89,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="hbox1">
+      <object class="GtkBox" id="hbox1">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
diff --git a/src/connection-editor/ce-page-ip4.ui b/src/connection-editor/ce-page-ip4.ui
index 51e030c1..01245ea6 100644
--- a/src/connection-editor/ce-page-ip4.ui
+++ b/src/connection-editor/ce-page-ip4.ui
@@ -25,7 +25,8 @@
       </row>
     </data>
   </object>
-  <object class="GtkVBox" id="IP4Page">
+  <object class="GtkBox" id="IP4Page">
+    <property name="orientation">vertical</property>
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="margin_start">12</property>
@@ -34,7 +35,8 @@
     <property name="margin_bottom">12</property>
     <property name="spacing">18</property>
     <child>
-      <object class="GtkHBox" id="hbox1">
+      <object class="GtkBox" id="hbox1">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">12</property>
@@ -81,7 +83,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="ip4_addresses_box">
+      <object class="GtkBox" id="ip4_addresses_box">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">6</property>
@@ -101,13 +104,15 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkBox" id="vbox1">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkBox" id="hbox2">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
@@ -305,7 +310,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <child>
-                      <object class="GtkHBox" id="hbox4">
+                      <object class="GtkBox" id="hbox4">
+                        <property name="orientation">horizontal</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="spacing">3</property>
diff --git a/src/connection-editor/ce-page-ip6.ui b/src/connection-editor/ce-page-ip6.ui
index 783d7a1d..28bb0a94 100644
--- a/src/connection-editor/ce-page-ip6.ui
+++ b/src/connection-editor/ce-page-ip6.ui
@@ -56,7 +56,8 @@
       </row>
     </data>
   </object>
-  <object class="GtkVBox" id="IP6Page">
+  <object class="GtkBox" id="IP6Page">
+    <property name="orientation">vertical</property>
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="margin_start">12</property>
@@ -65,7 +66,8 @@
     <property name="margin_bottom">12</property>
     <property name="spacing">18</property>
     <child>
-      <object class="GtkHBox" id="hbox1">
+      <object class="GtkBox" id="hbox1">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">12</property>
@@ -112,7 +114,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="ip6_addresses_box">
+      <object class="GtkBox" id="ip6_addresses_box">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">6</property>
@@ -132,13 +135,15 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkBox" id="vbox1">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkBox" id="hbox2">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
@@ -373,7 +378,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <child>
-                      <object class="GtkHBox" id="hbox4">
+                      <object class="GtkBox" id="hbox4">
+                        <property name="orientation">horizontal</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="spacing">3</property>
diff --git a/src/connection-editor/ce-page-mobile.ui b/src/connection-editor/ce-page-mobile.ui
index 087314b7..a191ab03 100644
--- a/src/connection-editor/ce-page-mobile.ui
+++ b/src/connection-editor/ce-page-mobile.ui
@@ -2,7 +2,8 @@
 <!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
-  <object class="GtkVBox" id="MobilePage">
+  <object class="GtkBox" id="MobilePage">
+    <property name="orientation">vertical</property>
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
@@ -12,7 +13,8 @@
     <property name="margin_bottom">12</property>
     <property name="spacing">18</property>
     <child>
-      <object class="GtkVBox" id="mobile_basic_vbox">
+      <object class="GtkBox" id="mobile_basic_vbox">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">6</property>
@@ -128,7 +130,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="mobile_advanced_vbox">
+      <object class="GtkBox" id="mobile_advanced_vbox">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">6</property>
@@ -195,7 +198,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkBox" id="hbox2">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
@@ -290,7 +294,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="hbox1">
+      <object class="GtkBox" id="hbox1">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
diff --git a/src/connection-editor/ce-page-ppp.ui b/src/connection-editor/ce-page-ppp.ui
index 6ee17918..1a481d89 100644
--- a/src/connection-editor/ce-page-ppp.ui
+++ b/src/connection-editor/ce-page-ppp.ui
@@ -2,7 +2,8 @@
 <!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
-  <object class="GtkVBox" id="PppPage">
+  <object class="GtkBox" id="PppPage">
+    <property name="orientation">vertical</property>
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="margin_start">12</property>
@@ -11,7 +12,8 @@
     <property name="margin_bottom">12</property>
     <property name="spacing">18</property>
     <child>
-      <object class="GtkVBox" id="vbox2">
+      <object class="GtkBox" id="vbox2">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">6</property>
@@ -32,13 +34,15 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox4">
+          <object class="GtkBox" id="vbox4">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkBox" id="hbox2">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">12</property>
@@ -116,7 +120,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="vbox5">
+      <object class="GtkBox" id="vbox5">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">6</property>
@@ -137,13 +142,15 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox6">
+          <object class="GtkBox" id="vbox6">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_start">12</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkVBox" id="vbox7">
+              <object class="GtkBox" id="vbox7">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
@@ -163,7 +170,8 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox8">
+                  <object class="GtkBox" id="vbox8">
+                    <property name="orientation">vertical</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
@@ -272,7 +280,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="vbox9">
+      <object class="GtkBox" id="vbox9">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">6</property>
diff --git a/src/connection-editor/ce-page-team.ui b/src/connection-editor/ce-page-team.ui
index 879d7142..d46bd784 100644
--- a/src/connection-editor/ce-page-team.ui
+++ b/src/connection-editor/ce-page-team.ui
@@ -182,7 +182,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="hbox2">
+      <object class="GtkBox" id="hbox2">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
@@ -326,7 +327,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="team_mtu_box">
+      <object class="GtkBox" id="team_mtu_box">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
diff --git a/src/connection-editor/ce-page-vlan.ui b/src/connection-editor/ce-page-vlan.ui
index 413988c6..c583722e 100644
--- a/src/connection-editor/ce-page-vlan.ui
+++ b/src/connection-editor/ce-page-vlan.ui
@@ -95,7 +95,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="hbox1">
+      <object class="GtkBox" id="hbox1">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
@@ -147,7 +148,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="vlan_parent_vbox">
+      <object class="GtkBox" id="vlan_parent_vbox">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
diff --git a/src/connection-editor/ce-page-wifi-security.ui b/src/connection-editor/ce-page-wifi-security.ui
index 8440e3b1..32cd0a06 100644
--- a/src/connection-editor/ce-page-wifi-security.ui
+++ b/src/connection-editor/ce-page-wifi-security.ui
@@ -55,7 +55,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="wifi_security_vbox">
+      <object class="GtkBox" id="wifi_security_vbox">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui
index db144aa7..d12c6266 100644
--- a/src/connection-editor/ce-page-wifi.ui
+++ b/src/connection-editor/ce-page-wifi.ui
@@ -66,7 +66,8 @@
     <property name="row_spacing">6</property>
     <property name="column_spacing">6</property>
     <child>
-      <object class="GtkHBox" id="wifi_mtu_hbox">
+      <object class="GtkBox" id="wifi_mtu_hbox">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
@@ -118,7 +119,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="wifi_device_vbox">
+      <object class="GtkBox" id="wifi_device_vbox">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
@@ -175,7 +177,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="wifi_tx_power_hbox">
+      <object class="GtkBox" id="wifi_tx_power_hbox">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
@@ -227,7 +230,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="wifi_rate_hbox">
+      <object class="GtkBox" id="wifi_rate_hbox">
+        <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
@@ -279,7 +283,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="wifi_bssid_vbox">
+      <object class="GtkBox" id="wifi_bssid_vbox">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
diff --git a/src/connection-editor/ce-ppp-auth-methods.ui b/src/connection-editor/ce-ppp-auth-methods.ui
index 657a0d47..07c13cc7 100644
--- a/src/connection-editor/ce-ppp-auth-methods.ui
+++ b/src/connection-editor/ce-ppp-auth-methods.ui
@@ -60,7 +60,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkBox" id="vbox1">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_start">5</property>
@@ -85,7 +86,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox3">
+              <object class="GtkBox" id="vbox3">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
diff --git a/src/connection-editor/nm-connection-editor.ui b/src/connection-editor/nm-connection-editor.ui
index 4a0956c5..1ab49963 100644
--- a/src/connection-editor/nm-connection-editor.ui
+++ b/src/connection-editor/nm-connection-editor.ui
@@ -9,7 +9,8 @@
     <property name="icon_name">preferences-system-network</property>
     <property name="type_hint">dialog</property>
     <child>
-      <object class="GtkVBox" id="ce-vbox">
+      <object class="GtkBox" id="ce-vbox">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">6</property>
@@ -87,7 +88,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox3">
+          <object class="GtkBox" id="vbox3">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_start">5</property>
@@ -96,7 +98,8 @@
             <property name="margin_bottom">5</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkHBox" id="hbox3">
+              <object class="GtkBox" id="hbox3">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">12</property>
@@ -152,7 +155,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox1">
+          <object class="GtkBox" id="hbox1">
+            <property name="orientation">horizontal</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
diff --git a/src/gsm-unlock.ui b/src/gsm-unlock.ui
index 42728251..99fe7309 100644
--- a/src/gsm-unlock.ui
+++ b/src/gsm-unlock.ui
@@ -62,7 +62,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="hbox7">
+          <object class="GtkBox" id="hbox7">
+            <property name="orientation">horizontal</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -82,7 +83,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox3">
+              <object class="GtkBox" id="vbox3">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">12</property>
@@ -205,14 +207,16 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="progress_hbox">
+                      <object class="GtkBox" id="progress_hbox">
+                        <property name="orientation">horizontal</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="margin_top">6</property>
                         <property name="margin_bottom">6</property>
                         <property name="spacing">6</property>
                         <child>
-                          <object class="GtkVBox" id="spinner_vbox">
+                          <object class="GtkBox" id="spinner_vbox">
+                            <property name="orientation">vertical</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <child>
diff --git a/src/info.ui b/src/info.ui
index 19e96630..17191994 100644
--- a/src/info.ui
+++ b/src/info.ui
@@ -51,11 +51,13 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox4">
+          <object class="GtkBox" id="vbox4">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkBox" id="hbox2">
+                <property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_start">5</property>
@@ -78,7 +80,8 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox2">
+                  <object class="GtkBox" id="vbox2">
+                    <property name="orientation">vertical</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="spacing">6</property>
diff --git a/src/libnm-gtk/wifi.ui b/src/libnm-gtk/wifi.ui
index 5f4bef0b..354617b8 100644
--- a/src/libnm-gtk/wifi.ui
+++ b/src/libnm-gtk/wifi.ui
@@ -24,7 +24,8 @@
       </row>
     </data>
   </object>
-  <object class="GtkHBox" id="hbox1">
+  <object class="GtkBox" id="hbox1">
+    <property name="orientation">horizontal</property>
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="margin_start">5</property>
@@ -47,7 +48,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="vbox1">
+      <object class="GtkBox" id="vbox1">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">6</property>
@@ -73,7 +75,8 @@
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
-              <object class="GtkVBox" id="security_vbox">
+              <object class="GtkBox" id="security_vbox">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
diff --git a/src/libnma/wifi.ui b/src/libnma/wifi.ui
index 24e02639..d0ac63a3 100644
--- a/src/libnma/wifi.ui
+++ b/src/libnma/wifi.ui
@@ -24,7 +24,8 @@
       </row>
     </data>
   </object>
-  <object class="GtkHBox" id="hbox1">
+  <object class="GtkBox" id="hbox1">
+    <property name="orientation">horizontal</property>
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="margin_start">12</property>
@@ -47,7 +48,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="vbox1">
+      <object class="GtkBox" id="vbox1">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">6</property>
@@ -73,7 +75,8 @@
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
-              <object class="GtkVBox" id="security_vbox">
+              <object class="GtkBox" id="security_vbox">
+                <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
diff --git a/src/wireless-security/eap-method-fast.ui b/src/wireless-security/eap-method-fast.ui
index c862f57e..67cad4fb 100644
--- a/src/wireless-security/eap-method-fast.ui
+++ b/src/wireless-security/eap-method-fast.ui
@@ -92,7 +92,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="eap_fast_inner_auth_vbox">
+          <object class="GtkBox" id="eap_fast_inner_auth_vbox">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
diff --git a/src/wireless-security/eap-method-peap.ui b/src/wireless-security/eap-method-peap.ui
index a75669bd..7baea54f 100644
--- a/src/wireless-security/eap-method-peap.ui
+++ b/src/wireless-security/eap-method-peap.ui
@@ -145,7 +145,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="eap_peap_inner_auth_vbox">
+          <object class="GtkBox" id="eap_peap_inner_auth_vbox">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
diff --git a/src/wireless-security/eap-method-simple.ui b/src/wireless-security/eap-method-simple.ui
index eae8cf3e..79afeb70 100644
--- a/src/wireless-security/eap-method-simple.ui
+++ b/src/wireless-security/eap-method-simple.ui
@@ -68,7 +68,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox5">
+          <object class="GtkBox" id="vbox5">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
diff --git a/src/wireless-security/eap-method-ttls.ui b/src/wireless-security/eap-method-ttls.ui
index 6ea1709c..e4474af2 100644
--- a/src/wireless-security/eap-method-ttls.ui
+++ b/src/wireless-security/eap-method-ttls.ui
@@ -37,7 +37,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="eap_ttls_inner_auth_vbox">
+          <object class="GtkBox" id="eap_ttls_inner_auth_vbox">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
diff --git a/src/wireless-security/ws-dynamic-wep.ui b/src/wireless-security/ws-dynamic-wep.ui
index 5f9bdc1b..cdc2a5c1 100644
--- a/src/wireless-security/ws-dynamic-wep.ui
+++ b/src/wireless-security/ws-dynamic-wep.ui
@@ -57,7 +57,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="dynamic_wep_method_vbox">
+          <object class="GtkBox" id="dynamic_wep_method_vbox">
+            <property name="orientation">vertical</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
diff --git a/src/wireless-security/ws-wpa-eap.ui b/src/wireless-security/ws-wpa-eap.ui
index c91a1d3f..80c0109d 100644
--- a/src/wireless-security/ws-wpa-eap.ui
+++ b/src/wireless-security/ws-wpa-eap.ui
@@ -57,10 +57,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="wpa_eap_method_vbox">
+          <object class="GtkBox" id="wpa_eap_method_vbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <placeholder/>
             </child>