[epiphany] CookiesDialog: Kill a level of GtkBox.

[Arnaud Bonatti <arnaudb src gnome org>]

commit 242b559217ac6d2a09bda035ca119c8b71409ab4
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sat Oct 31 05:32:07 2015 +0100

    CookiesDialog: Kill a level of GtkBox.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=757401

 src/resources/cookies-dialog.ui |  127 ++++++++++++++++++---------------------
 1 files changed, 59 insertions(+), 68 deletions(-)
---
diff --git a/src/resources/cookies-dialog.ui b/src/resources/cookies-dialog.ui
index 6519d35..0145c00 100644
--- a/src/resources/cookies-dialog.ui
+++ b/src/resources/cookies-dialog.ui
@@ -45,105 +45,96 @@
     </child>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
+        <property name="border_width">5</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkSearchEntry">
+            <property name="visible">True</property>
+            <property name="primary_icon_name">edit-find-symbolic</property>
+            <property name="primary_icon_activatable">False</property>
+            <property name="primary_icon_sensitive">False</property>
+            <property name="placeholder_text" translatable="yes">Search cookies</property>
+            <signal name="search-changed" handler="on_search_entry_changed"/>
+          </object>
+        </child>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="border_width">5</property>
+            <property name="border_width">0</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkSearchEntry">
-                <property name="visible">True</property>
-                <property name="primary_icon_name">edit-find-symbolic</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="primary_icon_sensitive">False</property>
-                <property name="placeholder_text" translatable="yes">Search cookies</property>
-                <signal name="search-changed" handler="on_search_entry_changed"/>
-              </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="border_width">0</property>
-                <property name="orientation">vertical</property>
+                <property name="expand">True</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="shadow_type">in</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="cookies_treeview">
                     <property name="visible">True</property>
-                    <property name="expand">True</property>
-                    <property name="hscrollbar_policy">never</property>
-                    <property name="shadow_type">in</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="key-press-event" handler="on_cookies_treeview_key_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="cookies_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="key-press-event" handler="on_cookies_treeview_key_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>
                   </object>
                 </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolbar">
+                <property name="visible">True</property>
                 <child>
-                  <object class="GtkToolbar">
+                  <object class="GtkToolItem">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkToolItem">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkButton" id="remove_toolbutton">
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="tooltip_text" translatable="yes">Delete the selected 
cookies</property>
+                            <property name="label" translatable="yes">Remove</property> <!-- TODO conflicts 
with the image -->
+                            <signal name="clicked" handler="on_remove_toolbutton_clicked"/>
                             <child>
-                              <object class="GtkButton" id="remove_toolbutton">
+                              <object class="GtkImage">
                                 <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="tooltip_text" translatable="yes">Delete the selected 
cookies</property>
-                                <property name="label" translatable="yes">Remove</property> <!-- TODO 
conflicts with the image -->
-                                <signal name="clicked" handler="on_remove_toolbutton_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>
                       </object>
                     </child>
-                    <style>
-                      <class name="inline-toolbar"/>
-                    </style>
                   </object>
                 </child>
+                <style>
+                  <class name="inline-toolbar"/>
+                </style>
               </object>
             </child>
           </object>