Merge upstream master

hammond-gtk/resources/org.gnome.Hammond.appdata.xml

@@ -28,7 +28,7 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release version="0.3.3" date="2018-05-19"/>
+    <release version="0.3.4" date="2018-05-20"/>
   </releases>
   <url type="homepage">https://gitlab.gnome.org/World/hammond</url>
   <update_contact>jpetridis@gnome.org</update_contact>

hammond-gtk/src/app.rs

@@ -280,7 +280,7 @@ fn about_dialog(window: &gtk::Window) {
     dialog.set_modal(true);
     // TODO: make it show it fetches the commit hash from which it was built
     // and the version number is kept in sync automaticly
-    dialog.set_version("0.3.3");
+    dialog.set_version("0.3.4");
     dialog.set_program_name("Hammond");
     // TODO: Need a wiki page first.
     // dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts");

hammond-gtk/src/headerbar.rs

@@ -202,3 +202,4 @@ fn on_url_change(
         }
     }
 }
+

hammond-gtk/src/widgets/episode.rs

@@ -299,7 +299,8 @@ fn progress_bar_helper(
     episode_rowid: i32,
 ) -> Result<glib::Continue, Error> {
     let (fraction, downloaded) = {
-        let m = prog.lock()
+        let m = prog
+            .lock()
             .map_err(|_| format_err!("Failed to get a lock on the mutex."))?;
         (m.get_fraction(), m.get_downloaded())
     };
@@ -357,7 +358,8 @@ fn total_size_helper(
 ) -> Result<glib::Continue, Error> {
     // Get the total_bytes.
     let total_bytes = {
-        let m = prog.lock()
+        let m = prog
+            .lock()
             .map_err(|_| format_err!("Failed to get a lock on the mutex."))?;
         m.get_total_size()
     };

hammond-gtk/src/widgets/home_view.rs

@@ -138,7 +138,8 @@ impl HomeView {
     /// Save the vertical scrollbar position.
     pub fn save_alignment(&self) -> Result<(), Error> {
         if let Ok(mut guard) = EPISODES_VIEW_VALIGNMENT.lock() {
-            let adj = self.scrolled_window
+            let adj = self
+                .scrolled_window
                 .get_vadjustment()
                 .ok_or_else(|| format_err!("Could not get the adjustment"))?;
             *guard = Some(SendCell::new(adj));

hammond-gtk/src/widgets/show.rs

@@ -130,7 +130,8 @@ impl ShowWidget {
     /// Save the scrollabar vajustment to the cache.
     pub fn save_vadjustment(&self, oldid: i32) -> Result<(), Error> {
         if let Ok(mut guard) = SHOW_WIDGET_VALIGNMENT.lock() {
-            let adj = self.scrolled_window
+            let adj = self
+                .scrolled_window
                 .get_vadjustment()
                 .ok_or_else(|| format_err!("Could not get the adjustment"))?;
             *guard = Some((oldid, SendCell::new(adj)));

hammond-gtk/src/widgets/shows_view.rs

@@ -78,7 +78,8 @@ impl ShowsView {
     /// Save the vertical scrollbar position.
     pub fn save_alignment(&self) -> Result<(), Error> {
         if let Ok(mut guard) = SHOWS_VIEW_VALIGNMENT.lock() {
-            let adj = self.scrolled_window
+            let adj = self
+                .scrolled_window
                 .get_vadjustment()
                 .ok_or_else(|| format_err!("Could not get the adjustment"))?;
             *guard = Some(SendCell::new(adj));