[soundconverter/f16] Fix traceback when trying to "Add File" for no "Recently Used"

[Michael Schwendt]

commit 24419b01cb7c58448a012ccaef866b211266a8b3
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Jan 26 09:13:18 2012 +0100

    Fix traceback when trying to "Add File" for no "Recently Used"
    
      folder (#784413).

 soundconverter-1.5.4-last-used-folder.patch |   16 ++++++++++++++++
 soundconverter.spec                         |    9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/soundconverter-1.5.4-last-used-folder.patch b/soundconverter-1.5.4-last-used-folder.patch
new file mode 100644
index 0000000..3fe4ac4
--- /dev/null
+++ b/soundconverter-1.5.4-last-used-folder.patch
@@ -0,0 +1,16 @@
+diff -Nurb --strip-trailing-cr soundconverter-1.5.4-pl5/src/soundconverter.py soundconverter-1.5.4/src/soundconverter.py
+--- soundconverter-1.5.4-pl5/src/soundconverter.py	2012-01-26 09:03:26.398854375 +0100
++++ soundconverter-1.5.4/src/soundconverter.py	2012-01-26 09:05:42.814473137 +0100
+@@ -2669,9 +2669,10 @@
+ 
+ 		ret = self.addchooser.run()
+ 		self.addchooser.hide()
+-		if ret == gtk.RESPONSE_OK:
++		folder = self.addchooser.get_current_folder_uri()
++		if ret == gtk.RESPONSE_OK and folder:
+ 			self.filelist.add_uris(self.addchooser.get_uris())
+-			self.prefs.set_string('last-used-folder', self.addchooser.get_current_folder_uri())
++			self.prefs.set_string('last-used-folder', folder)
+ 		self.set_sensitive()
+ 
+ 
diff --git a/soundconverter.spec b/soundconverter.spec
index 57a0e74..18169a3 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -1,6 +1,6 @@
 Name:           soundconverter
 Version:        1.5.4
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -30,6 +30,8 @@ Patch3: soundconverter-1.5.4-clearlist.patch
 #Patch4: soundconverter-1.5.4-flacogg.patch
 # Fedora bz 744596
 Patch5: soundconverter-1.5.4-gst-profile-bad.patch
+# Fedora bz 784413, lp 921515
+Patch6: soundconverter-1.5.4-last-used-folder.patch
 
 # enforce availability of this and its requirement "desktop-notification-daemon"
 Requires:       notify-python
@@ -73,6 +75,7 @@ writes anything the GStreamer library can.
 # F-15 https://admin.fedoraproject.org/updates/FEDORA-2011-16543
 #patch4 -p1 -b .flacoggdisable
 %patch5 -p1 -b .bz744596
+%patch6 -p1 -b .bz784413
 
 
 %build
@@ -120,6 +123,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Thu Jan 26 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.4-12
+- Fix traceback when trying to "Add File" for no "Recently Used"
+  folder (#784413).
+
 * Sat Dec 10 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.4-11
 - Reenable FLAC to Ogg Vorbis conversion and require at least the
   first build of the gstreamer-plugins-good package that contains