From bce80cca0b47165eaa77214cd7afd3b542477809 Mon Sep 17 00:00:00 2001
From: Zander Brown <ZanderBrown@users.noreply.github.com>
Date: Thu, 7 Jun 2018 19:12:56 +0100
Subject: [PATCH] Fix some style issues

---
 hammond-gtk/src/app.rs   | 9 +++++++++
 hammond-gtk/src/prefs.rs | 6 ++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs
index baa3251..8c5e569 100644
--- a/hammond-gtk/src/app.rs
+++ b/hammond-gtk/src/app.rs
@@ -216,6 +216,15 @@ impl App {
         action!(win, "quit", clone!(instance => move |_, _| instance.quit()));
         self.instance.set_accels_for_action("win.quit", &["<primary>q"]);
 
+        action!(
+            win,
+            "preferences",
+            clone!(win, settings => move |_, _| {
+                let dialog = Prefs::new(&settings);
+                dialog.show(&win);
+            })
+        );
+
         // Create the menu action
         action!(win, "menu",clone!(header => move |_, _| header.open_menu()));
         // Bind the hamburger menu button to `F10`
diff --git a/hammond-gtk/src/prefs.rs b/hammond-gtk/src/prefs.rs
index 48f3e1d..d87435a 100644
--- a/hammond-gtk/src/prefs.rs
+++ b/hammond-gtk/src/prefs.rs
@@ -87,8 +87,7 @@ impl Prefs {
         let cleanup_p = settings.get_string("cleanup-age-period").unwrap();
         let mut cleanup_pos = 0;
         let store = gtk::ListStore::new(&[gtk::Type::String]);
-        let mut i = 0;
-        for item in ["Seconds", "Minutes", "Hours", "Days", "Weeks"].iter() {
+        for (i, item) in ["Seconds", "Minutes", "Hours", "Days", "Weeks"].iter().enumerate() {
             let row: &[&ToValue] = &[item];
             if item.to_lowercase() == refresh_p {
                 refresh_pos = i;
@@ -97,9 +96,8 @@ impl Prefs {
                 cleanup_pos = i;
             }
             store.insert_with_values(None, &[0], &row);
-            i += 1;
         }
-        for combo in [self.refresh_type.clone(), self.cleanup_type.clone()].iter() {
+        for combo in &[self.refresh_type.clone(), self.cleanup_type.clone()] {
             combo.set_model(Some(&store));
             let renderer = gtk::CellRendererText::new();
             combo.pack_start(&renderer, true);