[gkrellm-volume] Apply patch from Gentoo to fix crash when re-enabling (#580165).

[Ville Skyttä]

commit 724d7b423b30ce328b4f1a2921496571ef3f3305
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Aug 5 22:53:39 2010 +0300

    Apply patch from Gentoo to fix crash when re-enabling (#580165).

 gkrellm-volume-2.1.13-reenable.patch |   14 ++++++++++++++
 gkrellm-volume.spec                  |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/gkrellm-volume-2.1.13-reenable.patch b/gkrellm-volume-2.1.13-reenable.patch
new file mode 100644
index 0000000..a3e3218
--- /dev/null
+++ b/gkrellm-volume-2.1.13-reenable.patch
@@ -0,0 +1,14 @@
+diff --git a/volume.c b/volume.c
+index 18418d1..58708d4 100644
+--- a/volume.c
++++ b/volume.c
+@@ -74,6 +74,9 @@ static void remove_all_mixers() {
+ static Slider *add_slider(Mixer *m, int dev) {
+   Slider *result,*s;
+   if (dev < 0 || dev >= mixer_get_nr_devices(m->mixer)) return NULL;
++  for (s = m->Sliderz ; s != NULL; s = s->next)
++    if (s->dev == dev)
++      return s;
+   result = malloc(sizeof(Slider));
+   result->mixer = m->mixer;
+   result->parent = m;
diff --git a/gkrellm-volume.spec b/gkrellm-volume.spec
index 0b101d1..5d18eaa 100644
--- a/gkrellm-volume.spec
+++ b/gkrellm-volume.spec
@@ -2,7 +2,7 @@
 
 Name:           gkrellm-volume
 Version:        2.1.13
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        GKrellM volume plugin
 
 Group:          Applications/Multimedia
@@ -15,6 +15,8 @@ Patch0:         %{name}-version.patch
 Patch1:         %{name}-optflags.patch
 # Mailed upstream 2010-01-04, #552022
 Patch2:         %{name}-2.1.13-device-updown-552022.patch
+# #580165, http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch?revision=1.1&view=markup
+Patch3:         %{name}-2.1.13-reenable.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gkrellm-devel >= 2.0
@@ -36,6 +38,7 @@ GKrellM plugin for controlling mixer devices.
 %patch0
 %patch1
 %patch2 -p1
+%patch3 -p1
 f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
@@ -65,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug  5 2010 Ville Skyttä <ville.skytta at iki.fi> - 2.1.13-13
+- Apply patch from Gentoo to fix crash when re-enabling (#580165).
+
 * Mon Jan  4 2010 Ville Skyttä <ville.skytta at iki.fi> - 2.1.13-12
 - Patch to fix crash when moving devices up/down in config (#552022).