[soundconverter] rediff

[Michael Schwendt]

commit 22a2d4a25b2d397aad517e6fd0960d439775cb31
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Dec 1 17:42:39 2012 +0100

    rediff

 soundconverter-2.0.4-folder-choose.patch |   10 ++++++----
 soundconverter.spec                      |    4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/soundconverter-2.0.4-folder-choose.patch b/soundconverter-2.0.4-folder-choose.patch
index 4aa4e05..d83b968 100644
--- a/soundconverter-2.0.4-folder-choose.patch
+++ b/soundconverter-2.0.4-folder-choose.patch
@@ -1,7 +1,7 @@
-diff -Nurb --strip-trailing-cr soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4/soundconverter/ui.py
+diff -Nur soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4/soundconverter/ui.py
 --- soundconverter-2.0.4-orig/soundconverter/ui.py	2012-10-06 12:43:23.000000000 +0200
-+++ soundconverter-2.0.4/soundconverter/ui.py	2012-12-01 17:28:26.481711975 +0100
-@@ -810,10 +810,20 @@
++++ soundconverter-2.0.4/soundconverter/ui.py	2012-12-01 17:40:48.913576862 +0100
+@@ -810,11 +810,21 @@
              self.set_sensitive()
              self.update_example()
  
@@ -16,12 +16,14 @@ diff -Nurb --strip-trailing-cr soundconverter-2.0.4-orig/soundconverter/ui.py so
          ret = self.target_folder_chooser.run()
          self.target_folder_chooser.hide()
          if ret == gtk.RESPONSE_OK:
+-            folder = self.target_folder_chooser.get_uri()
 +            folder = self.currently_viewed_folder
 +            if not folder:
 +                # the selected one
-             folder = self.target_folder_chooser.get_uri()
++                folder = self.target_folder_chooser.get_uri()
              if folder:
                  self.set_string('selected-folder', urllib.unquote(folder))
+                 self.update_selected_folder()
 @@ -1261,16 +1271,33 @@
              self.prefs.set_string('last-used-folder', folder)
          self.set_sensitive()
diff --git a/soundconverter.spec b/soundconverter.spec
index c5d2b31..93feba7 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -2,7 +2,7 @@
 
 Name:           soundconverter
 Version:        2.0.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -105,7 +105,7 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
-* Sat Dec  1 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.4-3
+* Sat Dec  1 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.4-4
 - Work around folder choose issue (lp #1063724) where the folder is reset
   to the last-used-folder because nothing is selected/highlighted.