This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit c95be057c23feb1b827da8614f842c0c0fc1f481 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Oct 26 18:37:30 2014 +0100 Make sound options configurable via X2Go Session Broker. (Fixes: #652). --- debian/changelog | 1 + onmainwindow.cpp | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e428838..1d62e8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goclient (4.0.3.1-0x2go1) UNRELEASED; urgency=medium * New upstream release (4.0.3.1): - Fully rework x2goclient man page. Add many options that haven't been documented so far. + - Make sound options configurable via X2Go Session Broker. (Fixes: #652). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 21 Oct 2014 13:22:39 +0200 diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 9234a2e..bcafbbf 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -4761,7 +4761,12 @@ void ONMainWindow::slotRetResumeSess ( bool result, sid=sessionExplorer->getLastSession()->id(); else sid="embedded"; - X2goSettings st ( "sessions" ); + + X2goSettings* st; + if (!brokerMode) + st= new X2goSettings( "sessions" ); + else + st= new X2goSettings(config.iniFile,QSettings::IniFormat); sound=st.setting()->value ( sid+"/sound", ( QVariant ) true ).toBool(); @@ -4819,6 +4824,9 @@ void ONMainWindow::slotRetResumeSess ( bool result, break; } #endif + + delete st; + } //Will be used in runCommand -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git