[SCM] jack-mixer/master: Add patch to avoid the disappearance of the channels' names while editing them.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b47b7cb87596c501a6f42d9d1ac3097803a3c6e2
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jul 2 10:15:51 2011 +0200

    Add patch to avoid the disappearance of the channels' names while editing them.
    
    Credits to John Hedges for the patch, Closes: #632357

diff --git a/debian/patches/0001-edit_channel_names.patch b/debian/patches/0001-edit_channel_names.patch
new file mode 100644
index 0000000..9807e66
--- /dev/null
+++ b/debian/patches/0001-edit_channel_names.patch
@@ -0,0 +1,40 @@
+Description: Read the contents before destroying the dialog.
+Author: John Hedges <john at drystone.co.uk>
+Bug-Debian: http://bugs.debian.org/632357
+Forwarded: no
+---
+ channel.py |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- jack-mixer.orig/channel.py
++++ jack-mixer/channel.py
+@@ -871,9 +871,8 @@ class ChannelPropertiesDialog(gtk.Dialog
+ 
+     def on_response_cb(self, dlg, response_id, *args):
+         self.channel.channel_properties_dialog = None
+-        self.destroy()
++        name = self.entry_name.get_text()
+         if response_id == gtk.RESPONSE_APPLY:
+-            name = self.entry_name.get_text()
+             self.channel.channel_name = name
+             try:
+                 self.channel.channel.volume_midi_cc = int(self.entry_volume_cc.get_text())
+@@ -883,6 +882,7 @@ class ChannelPropertiesDialog(gtk.Dialog
+                 self.channel.channel.balance_midi_cc = int(self.entry_balance_cc.get_text())
+             except ValueError:
+                 pass
++        self.destroy()
+ 
+     def on_entry_name_changed(self, entry):
+         sensitive = False
+@@ -933,9 +933,9 @@ class OutputChannelPropertiesDialog(Chan
+         self.display_solo_buttons.set_active(self.channel.display_solo_buttons)
+ 
+     def on_response_cb(self, dlg, response_id, *args):
+-        ChannelPropertiesDialog.on_response_cb(self, dlg, response_id, *args)
+         if response_id == gtk.RESPONSE_APPLY:
+             self.channel.display_solo_buttons = self.display_solo_buttons.get_active()
++        ChannelPropertiesDialog.on_response_cb(self, dlg, response_id, *args)
+ 
+ 
+ class NewOutputChannelDialog(OutputChannelPropertiesDialog):
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1c1ea07
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-edit_channel_names.patch

-- 
jack-mixer packaging