[gnome-control-center/wip/gbsneto/new-network-panel: 4/8] network: Cleanup GtkBuilder file

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 6fb799fdf1ba131252040a14348e68f29a20de8b
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Jul 12 10:43:36 2017 -0300

    network: Cleanup GtkBuilder file
    
    The Network panel UI file uses deprecated widgets and
    has many lines of needless code. This commit just cleans
    it up, as a preparation for turning the Network panel
    into a template class.

 panels/network/cc-network-panel.c |    2 +-
 panels/network/network.ui         |   37 ++++++++-----------------------------
 2 files changed, 9 insertions(+), 30 deletions(-)
---
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 6f62aa9..dc1eccc 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -1206,7 +1206,7 @@ cc_network_panel_init (CcNetworkPanel *panel)
         toplevel = gtk_widget_get_toplevel (GTK_WIDGET (panel));
         g_signal_connect_after (toplevel, "map", G_CALLBACK (on_toplevel_map), panel);
 
-        widget = GTK_WIDGET (gtk_builder_get_object (panel->builder, "vbox1"));
+        widget = GTK_WIDGET (gtk_builder_get_object (panel->builder, "main_box"));
         gtk_container_add (GTK_CONTAINER (panel), widget);
 
         /* Cold-plug existing connections */
diff --git a/panels/network/network.ui b/panels/network/network.ui
index 15f41c2..7b43185 100644
--- a/panels/network/network.ui
+++ b/panels/network/network.ui
@@ -25,7 +25,7 @@
       <column type="GObject"/>
     </columns>
   </object>
-      <object class="GtkVBox" id="vbox1">
+      <object class="GtkBox" id="main_box">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">12</property>
@@ -33,29 +33,33 @@
         <property name="margin-end">6</property>
         <property name="margin-top">6</property>
         <property name="margin-bottom">6</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkVBox" id="vbox2">
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">3</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkVBox" id="vbox10">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="margin_top">12</property>
                     <property name="margin_bottom">12</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkScrolledWindow" id="devices_scrolledwindow">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">never</property>
                         <property name="shadow_type">in</property>
+                        <property name="expand">True</property>
                         <child>
                           <object class="GtkTreeView" id="treeview_devices">
                             <property name="visible">True</property>
@@ -70,11 +74,6 @@
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkToolbar" id="devices_toolbar">
@@ -124,11 +123,6 @@
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkStack" id="stack">
@@ -136,25 +130,10 @@
                     <property name="can_focus">True</property>
                     <property name="transition_type">crossfade</property>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
       </object>
   <object class="GtkSizeGroup" id="sizegroup1">