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

[Arnaud Bonatti <arnaudb src gnome org>]

commit 120caed833cb280b363f05ef7d92ed153e1eb834
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Fri Oct 30 02:31:46 2015 +0100

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

 src/passwords-dialog.c            |    2 -
 src/resources/history-dialog.ui   |    1 -
 src/resources/passwords-dialog.ui |  148 +++++++++----------------------------
 3 files changed, 34 insertions(+), 117 deletions(-)
---
diff --git a/src/passwords-dialog.c b/src/passwords-dialog.c
index 5b6eee1..7d2a602 100644
--- a/src/passwords-dialog.c
+++ b/src/passwords-dialog.c
@@ -53,7 +53,6 @@ struct PasswordsDialogPrivate
        GtkWidget *treemodelsort;
        GtkWidget *remove_button;
        GtkWidget *show_passwords_button;
-       GtkWidget *clear_button;
        GtkWidget *password_column;
        GtkWidget *password_renderer;
        GtkWidget *treeview_popup_menu;
@@ -363,7 +362,6 @@ passwords_dialog_class_init (PasswordsDialogClass *klass)
        gtk_widget_class_bind_template_child_private (widget_class, PasswordsDialog, treemodelfilter);
        gtk_widget_class_bind_template_child_private (widget_class, PasswordsDialog, treemodelsort);
        gtk_widget_class_bind_template_child_private (widget_class, PasswordsDialog, passwords_treeview);
-       gtk_widget_class_bind_template_child_private (widget_class, PasswordsDialog, clear_button);
        gtk_widget_class_bind_template_child_private (widget_class, PasswordsDialog, remove_button);
        gtk_widget_class_bind_template_child_private (widget_class, PasswordsDialog, show_passwords_button);
        gtk_widget_class_bind_template_child_private (widget_class, PasswordsDialog, password_column);
diff --git a/src/resources/history-dialog.ui b/src/resources/history-dialog.ui
index 0b968e1..86425a4 100644
--- a/src/resources/history-dialog.ui
+++ b/src/resources/history-dialog.ui
@@ -42,7 +42,6 @@
     <child internal-child="headerbar">
       <object class="GtkHeaderBar">
         <property name="title" translatable="yes">History</property>
-        <property name="visible">True</property>
         <property name="show-close-button">True</property>
         <child>
           <object class="GtkButton">
diff --git a/src/resources/passwords-dialog.ui b/src/resources/passwords-dialog.ui
index 09da50e..42545fe 100644
--- a/src/resources/passwords-dialog.ui
+++ b/src/resources/passwords-dialog.ui
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Dec 10 19:19:35 2013 -->
 <interface>
   <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkListStore" id="liststore">
@@ -24,8 +23,6 @@
   </object>
   <template class="PasswordsDialog" 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>
@@ -33,18 +30,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">Passwords</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>
@@ -52,66 +44,40 @@
               <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">False</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 passwords</property>
-                <signal name="search-changed" handler="on_search_entry_changed" object="PasswordsDialog" 
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>
@@ -119,27 +85,26 @@
                     <child>
                       <object class="GtkTreeView" id="passwords_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_passwords_treeview_key_press_event" 
object="PasswordsDialog" swapped="no"/>
-                        <signal name="button-press-event" handler="on_passwords_treeview_button_press_event" 
object="PasswordsDialog" swapped="no"/>
+                        <signal name="key-press-event" handler="on_passwords_treeview_key_press_event"/>
+                        <signal name="button-press-event" 
handler="on_passwords_treeview_button_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="PasswordsDialog" 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>
@@ -147,14 +112,14 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+                          <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" id="cellrenderertext2"/>
+                              <object class="GtkCellRendererText"/>
                               <attributes>
                                 <attribute name="text">1</attribute>
                               </attributes>
@@ -175,121 +140,79 @@
                       </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_button">
                                 <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">Forget the selected 
passwords</property>
-                                <signal name="clicked" handler="on_remove_button_clicked" 
object="PasswordsDialog" swapped="no"/>
+                                <signal name="clicked" handler="on_remove_button_clicked"/>
                                 <child>
-                                  <object class="GtkImage" id="remove_password_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>
                     <child>
-                      <object class="GtkSeparatorToolItem" id="toolbutton1">
+                      <object class="GtkSeparatorToolItem">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="draw">False</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
-                        <property name="homogeneous">True</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolItem" id="toolitem2">
+                      <object class="GtkToolItem">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkBox" id="show_passwords_button_box">
+                          <object class="GtkBox">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkToggleButton" id="show_passwords_button">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="use_underline">True</property>
                                 <property name="tooltip_text" translatable="yes">Reveal all the 
passwords</property>
-                                <signal name="toggled" handler="on_show_passwords_button_toggled" 
object="PasswordsDialog" swapped="no"/>
+                                <signal name="toggled" handler="on_show_passwords_button_toggled"/>
                                 <child>
-                                  <object class="GtkImage" id="show_passwords_image">
+                                  <object class="GtkImage">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="icon_name">dialog-password-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="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>
@@ -299,23 +222,20 @@
   </template>
   <object class="GtkMenu" id="treeview_popup_menu">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuItem" id="copy_password_menuitem">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">_Copy Password</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="on_copy_password_menuitem_activate" object="PasswordsDialog" 
swapped="no"/>
+        <signal name="activate" handler="on_copy_password_menuitem_activate"/>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="copy_username_menuitem">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="label" translatable="yes">C_opy Username</property>
         <property name="use_underline">True</property>
-        <signal name="activate" handler="on_copy_username_menuitem_activate" object="PasswordsDialog" 
swapped="no"/>
+        <signal name="activate" handler="on_copy_username_menuitem_activate"/>
       </object>
     </child>
   </object>