[epiphany] cookies-dialog.ui: Manually unbloat.

[Arnaud Bonatti <arnaudb src gnome org>]

commit d509eebfa2015eebeed192daae083b409433e116
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sat Oct 31 05:20:24 2015 +0100

    cookies-dialog.ui: Manually unbloat.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=757401

 src/cookies-dialog.c            |    2 -
 src/resources/cookies-dialog.ui |  114 ++++++++-------------------------------
 2 files changed, 22 insertions(+), 94 deletions(-)
---
diff --git a/src/cookies-dialog.c b/src/cookies-dialog.c
index 2b5b4e0..af53b76 100644
--- a/src/cookies-dialog.c
+++ b/src/cookies-dialog.c
@@ -46,7 +46,6 @@ struct CookiesDialogPrivate
        GtkWidget *treemodelfilter;
        GtkWidget *treemodelsort;
        GtkWidget *remove_toolbutton;
-       GtkWidget *clear_button;
 
        WebKitCookieManager *cookie_manager;
        gboolean filled;
@@ -267,7 +266,6 @@ cookies_dialog_class_init (CookiesDialogClass *klass)
        gtk_widget_class_bind_template_child_private (widget_class, CookiesDialog, treemodelfilter);
        gtk_widget_class_bind_template_child_private (widget_class, CookiesDialog, treemodelsort);
        gtk_widget_class_bind_template_child_private (widget_class, CookiesDialog, cookies_treeview);
-       gtk_widget_class_bind_template_child_private (widget_class, CookiesDialog, clear_button);
        gtk_widget_class_bind_template_child_private (widget_class, CookiesDialog, remove_toolbutton);
 
        gtk_widget_class_bind_template_callback (widget_class, on_cookies_treeview_key_press_event);
diff --git a/src/resources/cookies-dialog.ui b/src/resources/cookies-dialog.ui
index e64d290..d97ee94 100644
--- a/src/resources/cookies-dialog.ui
+++ b/src/resources/cookies-dialog.ui
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkListStore" id="liststore">
@@ -20,8 +19,6 @@
   </object>
   <template class="CookiesDialog" parent="GtkDialog">
     <property name="height_request">500</property>
-    <property name="can_focus">False</property>
-    <property name="border_width">0</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="default_width">300</property>
@@ -29,18 +26,13 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="headerbar">
-      <object class="GtkHeaderBar" id="headerbar1">
+      <object class="GtkHeaderBar">
         <property name="title" translatable="yes">Cookies</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="show-close-button">True</property>
         <child>
           <object class="GtkButton" id="clear_button">
             <property name="label" translatable="yes">C_lear All</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="can_default">True</property>
-            <property name="receives_default">False</property>
             <property name="use_underline">True</property>
             <property name="valign">center</property>
             <style>
@@ -48,66 +40,41 @@
               <class name="text-button"/>
             </style>
           </object>
-          <packing>
-            <property name="pack_type">start</property>
-          </packing>
         </child>
       </object>
     </child>
     <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox2">
+      <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
-          <object class="GtkBox" id="box1">
+          <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="border_width">5</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkSearchEntry" id="searchentry1">
+              <object class="GtkSearchEntry">
                 <property name="visible">True</property>
-                <property name="can_focus">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="CookiesDialog" 
swapped="no"/>
+                <signal name="search-changed" handler="on_search_entry_changed"/>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkBox" id="box2">
+              <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="border_width">0</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow1">
+                  <object class="GtkScrolledWindow">
                     <property name="width_request">400</property>
                     <property name="height_request">300</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">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>
@@ -115,26 +82,25 @@
                     <child>
                       <object class="GtkTreeView" id="cookies_treeview">
                         <property name="visible">True</property>
-                        <property name="can_focus">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" 
object="CookiesDialog" swapped="no"/>
+                        <signal name="key-press-event" handler="on_cookies_treeview_key_press_event"/>
                         <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="treeview-selection">
+                          <object class="GtkTreeSelection" id="tree_selection"> <!-- TODO use this -->
                             <property name="mode">multiple</property>
-                            <signal name="changed" handler="on_treeview_selection_changed" 
object="CookiesDialog" swapped="no"/>
+                            <signal name="changed" handler="on_treeview_selection_changed"/>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                          <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" id="cellrenderertext1"/>
+                              <object class="GtkCellRendererText"/>
                               <attributes>
                                 <attribute name="text">0</attribute>
                               </attributes>
@@ -144,79 +110,43 @@
                       </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="toolbar1">
+                  <object class="GtkToolbar">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <style>
-                      <class name="inline-toolbar"/>
-                    </style>
-                    <property name="icon_size">1</property>
                     <child>
-                      <object class="GtkToolItem" id="toolitem1">
+                      <object class="GtkToolItem">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkBox" id="remove_button_box">
+                          <object class="GtkBox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkButton" id="remove_toolbutton">
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
-                                <property name="can_focus">False</property>
-                                <property name="use_underline">True</property>
                                 <property name="tooltip_text" translatable="yes">Delete the selected 
cookies</property>
-                                <property name="label" translatable="yes">Remove</property>
-                                <signal name="clicked" handler="on_remove_toolbutton_clicked" 
object="CookiesDialog" swapped="no"/>
+                                <property name="label" translatable="yes">Remove</property> <!-- TODO 
conflicts with the image -->
+                                <signal name="clicked" handler="on_remove_toolbutton_clicked"/>
                                 <child>
-                                  <object class="GtkImage" id="remove_cookie_image">
+                                  <object class="GtkImage">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="icon_name">list-remove-symbolic</property>
-                                    <property name="icon-size">1</property>
                                   </object>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                              </packing>
                             </child>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="homogeneous">True</property>
-                      </packing>
                     </child>
+                    <style>
+                      <class name="inline-toolbar"/>
+                    </style>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </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">1</property>
-          </packing>
         </child>
       </object>
     </child>