[soundconverter/f16] Fix traceback when enabling resampling without choosing a sample

[Michael Schwendt]

commit f8d74090aad8f6965bc456f71f6b4eb2bd70c8fa
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Jan 26 13:40:27 2012 +0100

    Fix traceback when enabling resampling without choosing a sample
    
      rate (#784791).

 soundconverter-1.5.4-resample-rate.patch |   26 ++++++++++++++++++++++++++
 soundconverter.spec                      |    9 ++++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/soundconverter-1.5.4-resample-rate.patch b/soundconverter-1.5.4-resample-rate.patch
new file mode 100644
index 0000000..1917593
--- /dev/null
+++ b/soundconverter-1.5.4-resample-rate.patch
@@ -0,0 +1,26 @@
+diff -Nur 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 13:35:43.523674770 +0100
+@@ -1896,14 +1896,14 @@
+ 		if self.get_int('output-resample'):
+ 			self.resample_toggle.set_active(self.get_int('output-resample'))
+ 			self.resample_rate.set_sensitive(1)
+-			rates = [11025, 22050, 44100, 48000, 72000, 96000, 128000]
+-			rate = self.get_int('resample-rate')
+-			try:
+-				idx = rates.index(rate)
+-			except ValueError:
+-				self.resample_rate.insert_text(0, str(rate))
+-				idx = 0
+-			self.resample_rate.set_active(idx)
++		rates = [11025, 22050, 44100, 48000, 72000, 96000, 128000]
++		rate = self.get_int('resample-rate')
++		try:
++			idx = rates.index(rate)
++		except ValueError:
++			self.resample_rate.insert_text(0, str(rate))
++			idx = 0
++		self.resample_rate.set_active(idx)
+ 
+ 		self.force_mono.set_active(self.get_int('force-mono'))
+ 
diff --git a/soundconverter.spec b/soundconverter.spec
index 18169a3..937d0dd 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -1,6 +1,6 @@
 Name:           soundconverter
 Version:        1.5.4
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -32,6 +32,8 @@ Patch3: soundconverter-1.5.4-clearlist.patch
 Patch5: soundconverter-1.5.4-gst-profile-bad.patch
 # Fedora bz 784413, lp 921515
 Patch6: soundconverter-1.5.4-last-used-folder.patch
+# Fedora bz 784791
+Patch7: soundconverter-1.5.4-resample-rate.patch
 
 # enforce availability of this and its requirement "desktop-notification-daemon"
 Requires:       notify-python
@@ -76,6 +78,7 @@ writes anything the GStreamer library can.
 #patch4 -p1 -b .flacoggdisable
 %patch5 -p1 -b .bz744596
 %patch6 -p1 -b .bz784413
+%patch7 -p1 -b .bz784791
 
 
 %build
@@ -123,6 +126,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Thu Jan 26 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.4-13
+- Fix traceback when enabling resampling without choosing a sample
+  rate (#784791).
+
 * 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).