[gmixer] - add patch to fix #537803 - add patch fo fix #638277

[tomspur]

commit 80504e2d760e37ea7a95d6c3048c4b233e033d12
Author: Thomas Spura <tomspur at fedoraproject.org>
Date:   Tue Sep 28 18:29:19 2010 +0200

    - add patch to fix #537803
    - add patch fo fix #638277

 gmixer-1.3-local-variable-not-assigned.patch |   12 ++++++++++++
 gmixer-1.3-no-title.patch                    |   17 +++++++++++++++++
 gmixer.spec                                  |   10 ++++++++++
 3 files changed, 39 insertions(+), 0 deletions(-)
---
diff --git a/gmixer-1.3-local-variable-not-assigned.patch b/gmixer-1.3-local-variable-not-assigned.patch
new file mode 100644
index 0000000..24224b3
--- /dev/null
+++ b/gmixer-1.3-local-variable-not-assigned.patch
@@ -0,0 +1,12 @@
+Index: src/gmixer
+===================================================================
+--- src/gmixer
++++ src/gmixer	2010-09-28 14:17:55.413692285 +0200
+@@ -1010,6 +1010,7 @@
+                     self._recordingbox.pack_start(obj,True,False,padding=3)
+                     self._recordingbox.pack_start(sep,False,False,padding=3)
+                 self._gvolume_dic[track.label.lower()] = obj
++        sep = gtk.VSeparator()
+         sep.hide()
+ 
+         self._playbackscroll.set_property("visible", \
diff --git a/gmixer-1.3-no-title.patch b/gmixer-1.3-no-title.patch
new file mode 100644
index 0000000..448a3f6
--- /dev/null
+++ b/gmixer-1.3-no-title.patch
@@ -0,0 +1,17 @@
+Index: src/gmixer
+===================================================================
+--- src/gmixer
++++ src/gmixer	2010-09-28 18:17:16.265803969 +0200
+@@ -928,7 +928,11 @@
+         self._current_mixer.set_volume(self._get_master_track(),tuple(values))
+ 
+     def _set_title(self):
+-        mixerlabel = APPNAME+" - "+self._current_mixer.get_property("device-name")+" ("+self._current_mixer.get_factory().get_longname()+")"
++        device_name = self._current_mixer.get_property("device-name")
++        if device_name:
++            mixerlabel = APPNAME+" - "+device_name+" ("+self._current_mixer.get_factory().get_longname()+")"
++        else:
++            mixerlabel = APPNAME
+         self._mainwin.set_title(mixerlabel)
+ 
+     def _change_device(self,item,mixer):
diff --git a/gmixer.spec b/gmixer.spec
index 2285df5..4751e6d 100644
--- a/gmixer.spec
+++ b/gmixer.spec
@@ -18,6 +18,10 @@ Source2:        gmixer-trayicon.desktop
 Patch0:         version_fix.patch
 Patch1:         gmixer-1.3-setup-py.patch
 Patch2:         icons.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=537803
+Patch3:         gmixer-1.3-local-variable-not-assigned.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=638277
+Patch4:         gmixer-1.3-no-title.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  pkgconfig
 BuildRequires:  python-devel, pygtk2-codegen, pygtk2-devel, gtk2-devel
@@ -39,6 +43,8 @@ Features:
 %patch0 -p1 -b .version_fix
 %patch1 -p1 -b .gmixer-1.3-setup-py
 %patch2 -p1 -b .icons
+%patch3 -p0 -b .local-variable-assignment
+%patch4 -p0 -b .no-title
 
 
 %build
@@ -95,6 +101,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 28 2010 Thomas Spura <tomspur at fedoraproject.org> - 1.3-17
+- add patch to fix #537803
+- add patch fo fix #638277
+
 * Fri Jul 30 2010 leigh scott <leigh123linux at googlemail.com> - 1.3-16
 - rebuild