[soundconverter/f16] Work around folder choose issue (lp #1063724) where the folder is reset

[Michael Schwendt]

commit 802ec9adb91070c5e86ffb78fac27605258ff00a
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Dec 1 22:14:20 2012 +0100

    Work around folder choose issue (lp #1063724) where the folder is reset
    
      to the last-used-folder because nothing is selected/highlighted.

 soundconverter-1.5.4-folder-chooser.patch |   50 +++++++++++++++++++++++++++++
 soundconverter.spec                       |    9 +++++-
 2 files changed, 58 insertions(+), 1 deletions(-)
---
diff --git a/soundconverter-1.5.4-folder-chooser.patch b/soundconverter-1.5.4-folder-chooser.patch
new file mode 100644
index 0000000..e5f26b5
--- /dev/null
+++ b/soundconverter-1.5.4-folder-chooser.patch
@@ -0,0 +1,50 @@
+diff -Nur soundconverter-1.5.4-16/src/soundconverter.py soundconverter-1.5.4/src/soundconverter.py
+--- soundconverter-1.5.4-16/src/soundconverter.py	2012-12-01 22:07:44.255642079 +0100
++++ soundconverter-1.5.4/src/soundconverter.py	2012-12-01 22:10:04.265484544 +0100
+@@ -2094,9 +2094,9 @@
+ 
+ 	def on_choose_folder_clicked(self, button):
+ 		ret = self.target_folder_chooser.run()
++		folder = self.target_folder_chooser.get_uri()
+ 		self.target_folder_chooser.hide()
+ 		if ret == gtk.RESPONSE_OK:
+-			folder = self.target_folder_chooser.get_uri()
+ 			if folder:
+ 				self.set_string('selected-folder', urllib.unquote(folder))
+ 				self.update_selected_folder()
+@@ -2670,10 +2670,11 @@
+ 			self.addchooser.set_current_folder_uri(last_folder)
+ 
+ 		ret = self.addchooser.run()
+-		self.addchooser.hide()
+ 		folder = self.addchooser.get_current_folder_uri()
++		uris = self.addchooser.get_uris()
++		self.addchooser.hide()
+ 		if ret == gtk.RESPONSE_OK and folder:
+-			self.filelist.add_uris(self.addchooser.get_uris())
++			self.filelist.add_uris(uris)
+ 			self.prefs.set_string('last-used-folder', folder)
+ 		self.set_sensitive()
+ 
+@@ -2684,10 +2685,10 @@
+ 			self.addfolderchooser.set_current_folder_uri(last_folder)
+ 
+ 		ret = self.addfolderchooser.run()
++		folders = self.addfolderchooser.get_uris()
++		currfolder = self.addfolderchooser.get_current_folder_uri()
+ 		self.addfolderchooser.hide()
+ 		if ret == gtk.RESPONSE_OK:
+-
+-			folders = self.addfolderchooser.get_uris()
+ 			extensions = None
+ 			if self.combo.get_active():
+ 				patterns = filepattern[self.combo.get_active()][1].split(';')
+@@ -2695,7 +2696,7 @@
+ 
+ 			self.filelist.add_uris(folders, extensions=extensions)
+ 
+-			self.prefs.set_string('last-used-folder', self.addfolderchooser.get_current_folder_uri())
++			self.prefs.set_string('last-used-folder', currfolder)
+ 
+ 		self.set_sensitive()
+ 
diff --git a/soundconverter.spec b/soundconverter.spec
index c7120de..66d9f36 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -1,6 +1,6 @@
 Name:           soundconverter
 Version:        1.5.4
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -36,6 +36,8 @@ Patch6: soundconverter-1.5.4-last-used-folder.patch
 Patch7: soundconverter-1.5.4-resample-rate.patch
 # Fedora bz 809404, TODO: verify if fixed in 2.0.2
 Patch8: soundconverter-1.5.4-plugin-install.patch
+# also affects 2.0.4
+Patch9: soundconverter-1.5.4-folder-chooser.patch
 
 # enforce availability of this and its requirement "desktop-notification-daemon"
 Requires:       notify-python
@@ -83,6 +85,7 @@ writes anything the GStreamer library can.
 %patch6 -p1 -b .bz784413
 %patch7 -p1 -b .bz784791
 %patch8 -p1 -b .bz809404
+%patch9 -p1 -b .folder-chooser
 
 
 %build
@@ -130,6 +133,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Sat Dec  1 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.4-16
+- Work around folder choose issue (lp #1063724) where the folder is reset
+  to the last-used-folder because nothing is selected/highlighted.
+
 * Tue Apr 24 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.4-15
 - Explicitly require pygtk2-libglade for "import gtk.glade" (#815710).