This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from c95be05 Make sound options configurable via X2Go Session Broker. (Fixes: #652). new d5351dd fix for last commit The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: onmainwindow.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit d5351dd734e0f73b159e3d98e21119f0d02faf59 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Oct 26 22:13:14 2014 +0100 fix for last commit --- onmainwindow.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/onmainwindow.cpp b/onmainwindow.cpp index bcafbbf..fa6465a 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -4768,9 +4768,9 @@ void ONMainWindow::slotRetResumeSess ( bool result, else st= new X2goSettings(config.iniFile,QSettings::IniFormat); - sound=st.setting()->value ( sid+"/sound", + sound=st->setting()->value ( sid+"/sound", ( QVariant ) true ).toBool(); - QString sndsys=st.setting()->value ( + QString sndsys=st->setting()->value ( sid+"/soundsystem", ( QVariant ) "pulse" ).toString(); if ( sndsys=="arts" ) @@ -4778,9 +4778,9 @@ void ONMainWindow::slotRetResumeSess ( bool result, if ( sndsys=="esd" ) sndSystem=ESD; #ifndef Q_OS_WIN - sndPort=st.setting()->value ( sid+"/sndport" ).toString(); + sndPort=st->setting()->value ( sid+"/sndport" ).toString(); #endif - startSoundServer=st.setting()->value ( + startSoundServer=st->setting()->value ( sid+"/startsoundsystem", true ).toBool(); @@ -4791,7 +4791,7 @@ void ONMainWindow::slotRetResumeSess ( bool result, #ifndef Q_OS_WIN - bool defPort=st.setting()->value ( sid+ + bool defPort=st->setting()->value ( sid+ "/defsndport",true ).toBool(); if ( defPort ) { @@ -4806,7 +4806,7 @@ void ONMainWindow::slotRetResumeSess ( bool result, } } #endif - sshSndTunnel=st.setting()->value ( sid+"/soundtunnel", + sshSndTunnel=st->setting()->value ( sid+"/soundtunnel", true ).toBool(); #ifdef Q_OS_WIN -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org