[pulseaudio-equalizer/f13/master] Fix rhbz #679005

[Hicham HAOUARI]

commit 04484753fd9d00b610fc8f0fd2e217f1d5b1981b
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Thu Mar 17 13:45:26 2011 +0000

    Fix rhbz #679005

 ...alizer-2.7-do-not-crash-on-missing-preset.patch |   17 ++++++++++++++
 pulseaudio-equalizer-2.7-window-icon.patch         |   24 ++++++++++++++++++++
 pulseaudio-equalizer.spec                          |   19 ++++++++++-----
 3 files changed, 54 insertions(+), 6 deletions(-)
---
diff --git a/pulseaudio-equalizer-2.7-do-not-crash-on-missing-preset.patch b/pulseaudio-equalizer-2.7-do-not-crash-on-missing-preset.patch
new file mode 100644
index 0000000..595a5e4
--- /dev/null
+++ b/pulseaudio-equalizer-2.7-do-not-crash-on-missing-preset.patch
@@ -0,0 +1,17 @@
+--- pulseaudio-equalizer-2.7/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py	2011-03-17 10:53:48.000000000 +0000
++++ pulseaudio-equalizer-2.7/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py.new	2011-03-17 11:18:04.000000000 +0000
+@@ -180,10 +180,13 @@ class Equalizer:
+ 		if os.path.isfile(presetdir1 + "/" + preset + ".preset"):
+ 			f = open(presetdir1 + "/" + preset + ".preset", "r")
+ 			rawdata=f.read().split('\n')
+-		else:
++			f.close
++		elif os.path.isfile(presetdir2 + "/" + preset + ".preset"):
+ 			f = open(presetdir2 + "/" + preset + ".preset", "r")
+ 			rawdata=f.read().split('\n')
+ 			f.close
++		else:
++			print "Can't find %s preset" % preset
+ 
+ 		ladspa_filename = str(rawdata[0])
+ 		ladspa_name = str(rawdata[1])
diff --git a/pulseaudio-equalizer-2.7-window-icon.patch b/pulseaudio-equalizer-2.7-window-icon.patch
new file mode 100644
index 0000000..5f4896c
--- /dev/null
+++ b/pulseaudio-equalizer-2.7-window-icon.patch
@@ -0,0 +1,24 @@
+--- pulseaudio-equalizer-2.7/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py	2011-03-17 10:23:27.000000000 +0000
++++ pulseaudio-equalizer-2.7/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py.new	2011-03-17 10:53:48.000000000 +0000
+@@ -359,7 +359,20 @@ class Equalizer:
+         self.window.connect("destroy", self.destroy_equalizer)
+         self.window.set_title(windowtitle + " [" + realstatus + "]")
+         self.window.set_border_width(0)
+-  	icon = self.window.set_icon_from_file("/usr/share/icons/hicolor/16x16/apps/gnome-volume-control.svg")
++        
++        icon_theme = gtk.icon_theme_get_default()
++        icon_theme = gtk.icon_theme_get_default()
++        if icon_theme.has_icon("multimedia-volume-control"):
++            icon = icon_theme.load_icon("multimedia-volume-control", 16, 0)
++            self.window.set_icon(icon)
++        elif icon_theme.has_icon("gnome-volume-control"):
++            icon = icon_theme.load_icon("gnome-volume-control",16,0)
++            self.window.set_icon(icon)
++        elif icon_theme.has_icon("stock_volume"):
++            icon = icon_theme.load_icon("stock_volume",16,0)
++            self.window.set_icon(icon)
++        else:
++            print ("No icon found, window will be iconless")
+ 
+         menu = gtk.Menu()
+ 
diff --git a/pulseaudio-equalizer.spec b/pulseaudio-equalizer.spec
index c826600..f773c4b 100644
--- a/pulseaudio-equalizer.spec
+++ b/pulseaudio-equalizer.spec
@@ -2,7 +2,7 @@
 
 Name:           pulseaudio-equalizer
 Version:        2.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A 15 Bands Equalizer for PulseAudio
 
 Group:          Applications/Multimedia
@@ -20,13 +20,18 @@ BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
 
-Requires:       pygtk2 ladspa-swh-plugins gnome-media
+Requires:       pygtk2 >= 2.4
+Requires:       ladspa-swh-plugins gnome-icon-theme
 Requires:       pulseaudio-utils >= 0.9.19
 
 # Force default equalizer persistence value, fixes rhbz #635400
 Patch0:         %{name}-%{version}-force-default-persistence-value.patch
 # Remove preamp per discussion with upstrem, fixes rhbz #639604
 Patch1:         %{name}-%{version}-remove-preamp.patch
+# Better search for the window icon, fixes rhbz #632940
+Patch2:         %{name}-%{version}-window-icon.patch
+# Do not crash on missing preset, fixes rhbz ##679005
+Patch3:         %{name}-%{version}-do-not-crash-on-missing-preset.patch
 
 %description
 PulseAudio Equalizer is a 15 bands system wide equalizer, that means
@@ -37,12 +42,10 @@ improvement.
 %setup -q
 cp debian/copyright COPYING
 cp debian/changelog ChangeLog
-%if %{fedora} >= 14
-sed -i 's|gnome-volume-control|multimedia-volume-control|g' usr/share/{applications/pulseaudio-equalizer.desktop,pulseaudio-equalizer/pulseaudio-equalizer.py}
-%endif 
-
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 
@@ -70,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}-gtk.1.*
 
 %changelog
+* Thu Mar 17 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 2.7-6
+- Better fix for rhbz #632940
+- Do not crash on missing preset, fixes rhbz #679005
+
 * Wed Jan 05 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 2.7-5
 - Rework preamp patch