[epiphany] PasswordsDialog: Kill a (now) unneeded level of GtkBox.

[Arnaud Bonatti <arnaudb src gnome org>]

commit 8c0e6a1cdfe7a28754a6a40b86b10b1931bc5dc3
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Fri Oct 30 14:22:51 2015 +0100

    PasswordsDialog: Kill a (now) unneeded level of GtkBox.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=757344

 src/resources/passwords-dialog.ui |  154 ++++++++++++++++++-------------------
 1 files changed, 74 insertions(+), 80 deletions(-)
---
diff --git a/src/resources/passwords-dialog.ui b/src/resources/passwords-dialog.ui
index 9ff950e..63ed16e 100644
--- a/src/resources/passwords-dialog.ui
+++ b/src/resources/passwords-dialog.ui
@@ -70,111 +70,105 @@
           </object>
         </child>
         <child>
-          <object class="GtkBox">
+          <object class="GtkScrolledWindow">
+            <property name="width_request">400</property>
+            <property name="height_request">300</property>
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
+            <property name="expand">True</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="min_content_width">300</property>
+            <property name="min_content_height">300</property>
             <child>
-              <object class="GtkScrolledWindow">
-                <property name="width_request">400</property>
-                <property name="height_request">300</property>
+              <object class="GtkTreeView" id="passwords_treeview">
                 <property name="visible">True</property>
-                <property name="expand">True</property>
-                <property name="hscrollbar_policy">never</property>
-                <property name="min_content_width">300</property>
-                <property name="min_content_height">300</property>
+                <property name="model">treemodelsort</property>
+                <property name="enable_search">False</property>
+                <property name="search_column">0</property>
+                <signal name="button-press-event" handler="on_passwords_treeview_button_press_event"/>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="tree_selection">
+                    <property name="mode">multiple</property>
+                    <signal name="changed" handler="on_treeview_selection_changed"/>
+                  </object>
+                </child>
                 <child>
-                  <object class="GtkTreeView" id="passwords_treeview">
-                    <property name="visible">True</property>
-                    <property name="model">treemodelsort</property>
-                    <property name="enable_search">False</property>
-                    <property name="search_column">0</property>
-                    <signal name="button-press-event" handler="on_passwords_treeview_button_press_event"/>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection" id="tree_selection">
-                        <property name="mode">multiple</property>
-                        <signal name="changed" handler="on_treeview_selection_changed"/>
-                      </object>
-                    </child>
+                  <object class="GtkTreeViewColumn">
+                    <property name="sizing">autosize</property>
+                    <property name="title" translatable="yes">Site</property>
+                    <property name="clickable">True</property>
+                    <property name="reorderable">True</property>
+                    <property name="sort_column_id">0</property>
                     <child>
-                      <object class="GtkTreeViewColumn">
-                        <property name="sizing">autosize</property>
-                        <property name="title" translatable="yes">Site</property>
-                        <property name="clickable">True</property>
-                        <property name="reorderable">True</property>
-                        <property name="sort_column_id">0</property>
-                        <child>
-                          <object class="GtkCellRendererText"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
-                      </object>
+                      <object class="GtkCellRendererText"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
                     </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn">
+                    <property name="sizing">autosize</property>
+                    <property name="title" translatable="yes">User Name</property>
+                    <property name="clickable">True</property>
+                    <property name="reorderable">True</property>
+                    <property name="sort_column_id">1</property>
                     <child>
-                      <object class="GtkTreeViewColumn">
-                        <property name="sizing">autosize</property>
-                        <property name="title" translatable="yes">User Name</property>
-                        <property name="clickable">True</property>
-                        <property name="reorderable">True</property>
-                        <property name="sort_column_id">1</property>
-                        <child>
-                          <object class="GtkCellRendererText"/>
-                          <attributes>
-                            <attribute name="text">1</attribute>
-                          </attributes>
-                        </child>
-                      </object>
+                      <object class="GtkCellRendererText"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
                     </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="password_column">
+                    <property name="title" translatable="yes">Password</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="password_column">
-                        <property name="title" translatable="yes">Password</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="password_renderer"/>
-                          <attributes>
-                            <attribute name="text">3</attribute>
-                          </attributes>
-                        </child>
-                      </object>
+                      <object class="GtkCellRendererText" id="password_renderer"/>
+                      <attributes>
+                        <attribute name="text">3</attribute>
+                      </attributes>
                     </child>
                   </object>
                 </child>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkActionBar">
+            <property name="visible">True</property>
             <child>
-              <object class="GtkActionBar">
+              <object class="GtkButton">
                 <property name="visible">True</property>
+                <property name="tooltip_text" translatable="yes">Forget the selected passwords</property>
+                <property name="action-name">passwords.forget</property>
+                <accelerator key="Delete" signal="clicked"/>
+                <accelerator key="KP_Delete" signal="clicked"/>
                 <child>
-                  <object class="GtkButton">
+                  <object class="GtkImage">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes">Forget the selected passwords</property>
-                    <property name="action-name">passwords.forget</property>
-                    <accelerator key="Delete" signal="clicked"/>
-                    <accelerator key="KP_Delete" signal="clicked"/>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="icon_name">list-remove-symbolic</property>
-                      </object>
-                    </child>
+                    <property name="icon_name">list-remove-symbolic</property>
                   </object>
                 </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleButton" id="show_passwords_button">
+                <property name="visible">True</property>
+                <property name="tooltip_text" translatable="yes">Reveal all the passwords</property>
+                <property name="action-name">passwords.show-passwords</property>
                 <child>
-                  <object class="GtkToggleButton" id="show_passwords_button">
+                  <object class="GtkImage">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes">Reveal all the passwords</property>
-                    <property name="action-name">passwords.show-passwords</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="icon_name">dialog-password-symbolic</property>
-                      </object>
-                    </child>
+                    <property name="icon_name">dialog-password-symbolic</property>
                   </object>
-                  <packing>
-                    <property name="pack-type">end</property>
-                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
             </child>
           </object>
         </child>