[soundconverter] Patch for gnome bz #683708 and lp #1063724 GtkFileChooser problem.

[Michael Schwendt]

commit 78ae87af4352ec362abc0f9ccdbf62dc5f2ff396
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Dec 1 21:02:42 2012 +0100

    Patch for gnome bz #683708 and lp #1063724 GtkFileChooser problem.

 soundconverter-2.0.4-folder-choose.patch |   37 ++++++++++++++++++++++++++++++
 soundconverter.spec                      |   10 +++++---
 2 files changed, 43 insertions(+), 4 deletions(-)
---
diff --git a/soundconverter-2.0.4-folder-choose.patch b/soundconverter-2.0.4-folder-choose.patch
new file mode 100644
index 0000000..ac13ee3
--- /dev/null
+++ b/soundconverter-2.0.4-folder-choose.patch
@@ -0,0 +1,37 @@
+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 20:53:47.967028021 +0100
+@@ -812,9 +812,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()
+@@ -1254,8 +1254,8 @@
+             self.addchooser.set_current_folder_uri(last_folder)
+ 
+         ret = self.addchooser.run()
+-        self.addchooser.hide()
+         folder = self.addchooser.get_current_folder_uri()
++        self.addchooser.hide()
+         if ret == gtk.RESPONSE_OK and folder:
+             self.filelist.add_uris(self.addchooser.get_uris())
+             self.prefs.set_string('last-used-folder', folder)
+@@ -1267,11 +1267,9 @@
+             self.addfolderchooser.set_current_folder_uri(last_folder)
+ 
+         ret = self.addfolderchooser.run()
++        folders = self.addfolderchooser.get_uris()
+         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(';')
diff --git a/soundconverter.spec b/soundconverter.spec
index 074f08b..64bcd53 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -2,7 +2,7 @@
 
 Name:           soundconverter
 Version:        2.0.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -13,6 +13,8 @@ BuildArch:      noarch
 
 # reported, lp #1077880
 Patch0: soundconverter-2.0.4-no-space-left.patch
+# work around lp #1063724 / gnome bz #683708
+Patch1: soundconverter-2.0.4-folder-choose.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool gettext
@@ -52,6 +54,7 @@ writes anything the GStreamer library can.
 %prep
 %setup -q -n %{name}-%{tar_ver}
 %patch0 -p1 -b .no-space-left
+%patch1 -p1 -b .folder-choose
 
 
 %build
@@ -102,9 +105,8 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
-* Sat Dec  1 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.4-5
-- Revert temporary changes for gnome bz #683708 and lp #1063724 as there
-  are too many ways to trigger the bug in the GtkFileChooser.
+* Sat Dec  1 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.4-6
+- Patch for gnome bz #683708 and lp #1063724 GtkFileChooser problem.
 
 * 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