From 2eb58eae0069eae74ebafeb7ebe75efa6f1e24f1 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Sun, 17 Dec 2017 13:57:08 +0200
Subject: [PATCH] Headerbar: Remove refresh button.

---
 hammond-gtk/resources/gtk/headerbar.ui | 21 ---------------------
 hammond-gtk/src/headerbar.rs           | 16 ++++------------
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui
index aa7d08e..91bb4f0 100644
--- a/hammond-gtk/resources/gtk/headerbar.ui
+++ b/hammond-gtk/resources/gtk/headerbar.ui
@@ -190,27 +190,6 @@
         </child>
       </object>
     </child>
-    <child>
-      <object class="GtkButton" id="ref_button">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="valign">center</property>
-        <property name="use_underline">True</property>
-        <property name="always_show_image">True</property>
-        <child>
-          <object class="GtkImage">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="icon_name">view-refresh-symbolic</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="pack_type">end</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
     <child>
       <object class="GtkMenuButton" id="menu">
         <property name="visible">True</property>
diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs
index 4eb1a6d..9d62773 100644
--- a/hammond-gtk/src/headerbar.rs
+++ b/hammond-gtk/src/headerbar.rs
@@ -12,7 +12,6 @@ use content::Content;
 #[derive(Debug)]
 pub struct Header {
     pub container: gtk::HeaderBar,
-    refresh: gtk::Button,
     add_toggle: gtk::MenuButton,
     switch: gtk::StackSwitcher,
     back_button: gtk::Button,
@@ -24,7 +23,6 @@ impl Default for Header {
         let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui");
 
         let header: gtk::HeaderBar = builder.get_object("headerbar").unwrap();
-        let refresh: gtk::Button = builder.get_object("ref_button").unwrap();
         let add_toggle: gtk::MenuButton = builder.get_object("add_toggle_button").unwrap();
         let switch: gtk::StackSwitcher = builder.get_object("switch").unwrap();
         let back_button: gtk::Button = builder.get_object("back_button").unwrap();
@@ -35,7 +33,6 @@ impl Default for Header {
 
         Header {
             container: header,
-            refresh,
             add_toggle,
             switch,
             back_button,
@@ -73,11 +70,6 @@ impl Header {
         }));
         self.add_toggle.set_popover(&add_popover);
 
-        // FIXME: There appears to be a memmory leak here.
-        self.refresh.connect_clicked(clone!(content => move |_| {
-            utils::refresh_feed(content.clone(), None);
-        }));
-
         let switch = &self.switch;
         let add_toggle = &self.add_toggle;
         let show_title = &self.show_title;
@@ -96,7 +88,7 @@ impl Header {
         self.switch.hide();
         self.add_toggle.hide();
         self.back_button.show();
-        self.show_title.set_text(title);
+        self.set_show_title(title);
         self.show_title.show();
     }
 
@@ -107,9 +99,9 @@ impl Header {
         self.show_title.hide();
     }
 
-    // pub fn set_show_title(&self, title: &str) {
-    //     self.show_title.set_text(title)
-    // }
+    pub fn set_show_title(&self, title: &str) {
+        self.show_title.set_text(title)
+    }
 }
 
 fn on_add_bttn_clicked(content: Rc<Content>, entry: &gtk::Entry) {