[proaudio] [2069] jack_mixer-9: patch for the channel rename bug

[subversion@xxxxxxxxxxxxx]

Revision: 2069
Author:   nedko
Date:     2012-01-16 02:24:50 +0100 (Mon, 16 Jan 2012)
Log Message:
-----------
jack_mixer-9: patch for the channel rename bug

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/jack_mixer/Manifest
    trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-9.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/jack_mixer/files/empty_name_on_rename.patch

Modified: trunk/overlays/proaudio/media-sound/jack_mixer/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_mixer/Manifest	2012-01-16 01:24:48 UTC (rev 2068)
+++ trunk/overlays/proaudio/media-sound/jack_mixer/Manifest	2012-01-16 01:24:50 UTC (rev 2069)
@@ -1,7 +1,8 @@
+AUX empty_name_on_rename.patch 1795 RMD160 0cd4234e1091d4f16e1069a75ffbc47dfc8fbcf1 SHA1 83cd22ea18893d5595ab1a438f7a9c67e9010ee7 SHA256 caa18dee37e68ff8fcea1f8571fa39628eee941e3ac81f42482a0539c59be7ca
 DIST jack_mixer-8.tar.gz 380897 RMD160 c6003f9e4ee33daad3ac1b48425bf130801c666f SHA1 b031ade323a6835d57cc69d108edc76b9aa2a09d SHA256 47f451b7ca730bc81f9becf87d6d3b981c2333101f3808c8e30e809bdd1e9826
 DIST jack_mixer-9.tar.gz 381557 RMD160 f4e9354afc685769dc230da1cc777953ba428615 SHA1 2ea6bb2ffda7ab65d9105165a3df64e5dae67179 SHA256 7683b637368bf515031c362c1a698edfaf390f1b3ba0f5211fe3277a496520f7
 EBUILD jack_mixer-8.ebuild 928 RMD160 56d15e582ad2956053e1daec343a7ffc404f779b SHA1 546f79aabe6ee87164ab7ed525f78031b40a8522 SHA256 aea5f6c7b604dae3a97babc37da98fc4af1d3020058a1ebb8e2c8abd02f28692
-EBUILD jack_mixer-9.ebuild 884 RMD160 6e53a297e856ff0402cf16e52b5f730c05d3b400 SHA1 5c4006461b4a5c29b879b8976f94b8ca8fee2063 SHA256 eda30c9990c1ef1fe77df53186918c39a346bea7d382fb2354cc1a7d5675e2d1
+EBUILD jack_mixer-9.ebuild 952 RMD160 0adf8db41649a104be39d08feb96a0dc7ff9bb56 SHA1 0e9824384aea23fade6a0e577d080d3b6b2d8b7b SHA256 e1fe86a291df85e2254730ade3b62a2b0f2ef1a63e7fe333ad30b748c0f26024
 EBUILD jack_mixer-9999.ebuild 979 RMD160 cabdee19f9613de46c237fab281e36959ecc276e SHA1 53e666d1ed4b32c4b52b1d7f97380514c0b77929 SHA256 dc455e5e165b7e8ceaa28ef491277cf23bcde813b9e9c4e357dce21f8630c960
 MISC ChangeLog 1028 RMD160 197fb10a383ac1e5553fcfd3903738e4f8ffc0dd SHA1 6772b03f22395d158700fa59969630ecc4737ea4 SHA256 664a2d764571baa2c9555d29303955bbd9e436021634b6cd5a00b33949b2d4df
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Added: trunk/overlays/proaudio/media-sound/jack_mixer/files/empty_name_on_rename.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_mixer/files/empty_name_on_rename.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/jack_mixer/files/empty_name_on_rename.patch	2012-01-16 01:24:50 UTC (rev 2069)
@@ -0,0 +1,46 @@
+From 3a682dd20df4e978075a1862fcccbbf0ed02f418 Mon Sep 17 00:00:00 2001
+From: John Hedges <john@xxxxxxxxxxxxxx>
+Date: Tue, 12 Jul 2011 11:40:46 +0200
+Subject: [PATCH] Read new settings before the dialog is destroyed
+
+---
+ channel.py |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/channel.py b/channel.py
+index c0efa92..76cf010 100644
+--- a/channel.py
++++ b/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(ChannelPropertiesDialog):
+         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):
+-- 
+1.6.5.GIT
+

Modified: trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-9.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-9.ebuild	2012-01-16 01:24:48 UTC (rev 2068)
+++ trunk/overlays/proaudio/media-sound/jack_mixer/jack_mixer-9.ebuild	2012-01-16 01:24:50 UTC (rev 2069)
@@ -27,6 +27,10 @@
 	phat? ( media-libs/pyphat )
 	lash? ( || ( media-sound/lash[python] >=media-libs/pylash-3_pre ) )"
 
+src_prepare() {
+	epatch "${FILESDIR}/empty_name_on_rename.patch"
+}
+
 src_install() {
 	gnome2_src_install
 	dosym /usr/bin/jack_mixer.py /usr/bin/jack_mixer