[gedit] Clean up how filebrowser toolbar is built

[Paolo Borelli <pborelli src gnome org>]

commit d2638ed82b99d9e44cc3e0c40e37c4be6fdc77ee
Author: Paolo Borelli <pborelli gnome org>
Date:   Tue Jul 29 14:59:54 2014 +0200

    Clean up how filebrowser toolbar is built

 plugins/filebrowser/gedit-file-browser-widget.c    |   11 ------
 .../resources/ui/gedit-file-browser-widget.ui      |   37 ++++++++------------
 2 files changed, 15 insertions(+), 33 deletions(-)
---
diff --git a/plugins/filebrowser/gedit-file-browser-widget.c b/plugins/filebrowser/gedit-file-browser-widget.c
index 73f3cba..9d32bbb 100644
--- a/plugins/filebrowser/gedit-file-browser-widget.c
+++ b/plugins/filebrowser/gedit-file-browser-widget.c
@@ -120,9 +120,7 @@ struct _GeditFileBrowserWidgetPrivate
        GMenuModel *bookmarks_menu;
 
        GtkWidget *previous_button;
-       GtkWidget *previous_image;
        GtkWidget *next_button;
-       GtkWidget *next_image;
 
        GtkWidget *combo;
        GtkTreeStore *combo_model;
@@ -562,9 +560,7 @@ gedit_file_browser_widget_class_init (GeditFileBrowserWidgetClass *klass)
        gtk_widget_class_set_template_from_resource (widget_class,
                                                     
"/org/gnome/gedit/plugins/file-browser/ui/gedit-file-browser-widget.ui");
        gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, previous_button);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, previous_image);
        gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, next_button);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, next_image);
        gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, combo);
        gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, combo_model);
        gtk_widget_class_bind_template_child_private (widget_class, GeditFileBrowserWidget, location_entry);
@@ -996,13 +992,6 @@ gedit_file_browser_widget_init (GeditFileBrowserWidget *obj)
 
        gtk_widget_init_template (GTK_WIDGET (obj));
 
-       gtk_image_set_from_icon_name (GTK_IMAGE (obj->priv->previous_image),
-                                     "go-previous-symbolic",
-                                     GTK_ICON_SIZE_MENU);
-       gtk_image_set_from_icon_name (GTK_IMAGE (obj->priv->next_image),
-                                     "go-next-symbolic",
-                                     GTK_ICON_SIZE_MENU);
-
        g_signal_connect (obj->priv->previous_button, "button-press-event",
                          G_CALLBACK (on_location_button_press_event), obj);
        g_signal_connect (obj->priv->next_button, "button-press-event",
diff --git a/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui 
b/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
index 22267f4..9ea8352 100644
--- a/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
+++ b/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
@@ -51,13 +51,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">browser.previous_location</property>
-                    <child>
-                      <object class="GtkImage" id="previous_image">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_size">1</property>
-                      </object>
-                    </child>
+                    <property name="image">previous_image</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -71,13 +65,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">browser.next_location</property>
-                    <child>
-                      <object class="GtkImage" id="next_image">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_size">1</property>
-                      </object>
-                    </child>
+                    <property name="image">next_image</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -113,14 +101,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">browser.up</property>
-                    <child>
-                      <object class="GtkImage" id="image3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_size">1</property>
-                        <property name="icon_name">go-up-symbolic</property>
-                      </object>
-                    </child>
+                    <property name="image">up_image</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -235,6 +216,18 @@
       </packing>
     </child>
   </template>
+  <object class="GtkImage" id="previous_image">
+    <property name="visible">True</property>
+    <property name="icon_name">go-previous-symbolic</property>
+  </object>
+  <object class="GtkImage" id="next_image">
+    <property name="visible">True</property>
+    <property name="icon_name">go-next-symbolic</property>
+  </object>
+  <object class="GtkImage" id="up_image">
+    <property name="visible">True</property>
+    <property name="icon_name">go-up-symbolic</property>
+  </object>
   <object class="GtkSizeGroup" id="toolbar_size_group">
       <property name="mode">vertical</property>
       <widgets>