[X2Go-Commits] [x2goclient] 01/01: onmainwindow.cpp: fix up pulse config file generation and PULSE_CLIENTCONFIG setting once more.
git-admin at x2go.org
git-admin at x2go.org
Sat Apr 25 16:53:06 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit ee11aa4589600ed1aa4f0b559e8d50e3dbe9e385
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Apr 25 16:51:57 2015 +0200
onmainwindow.cpp: fix up pulse config file generation and PULSE_CLIENTCONFIG setting once more.
---
debian/changelog | 2 ++
src/onmainwindow.cpp | 38 +++++++++++++++++++-------------------
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7c4673d..9c2e3f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -313,6 +313,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
- onmainwindow.cpp: don't let a potential terminal affect the help string
shown in the GUI.
- help.h: lower default splitting length to 100 characters.
+ - onmainwindow.cpp: fix up pulse config file generation and
+ PULSE_CLIENTCONFIG setting once more.
[ Fernando Pedemonte ]
* New upstream release (4.0.4.0):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 080ea03..b3f5267 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -4976,30 +4976,30 @@ void ONMainWindow::slotRetResumeSess ( bool result,
startSoundServer=false;
QString scmd;
if ( !sshSndTunnel )
- scmd="echo \\\"default-server=$(echo "
- "$SSH_CLIENT | awk '{print $1}'):"+
+ scmd="echo \"default-server=$(echo "
+ "\"$SSH_CLIENT\" | awk '{print $1}'):"+
sndPort+
- "\\\" > $HOME/.x2go/C-"+
+ "\" > \"${HOME}/.x2go/C-"+
resumingSession.sessionId+
- "/.pulse-client.conf"
- ";echo \\\"cookie-file=${HOME}/.x2go/C-"+
+ "/.pulse-client.conf\""
+ ";echo \"cookie-file=${HOME}/.x2go/C-"+
resumingSession.sessionId+
"/.pulse-cookie"+
- "\\\" >> ${HOME}/.x2go/C-"+
+ "\" >> \"${HOME}/.x2go/C-"+
resumingSession.sessionId+
- "/.pulse-client.conf";
+ "/.pulse-client.conf\"";
else
- scmd="echo \\\"default-server=localhost:"+
+ scmd="echo \"default-server=localhost:"+
resumingSession.sndPort+
- "\\\" > $HOME/.x2go/C-"+
+ "\" > \"${HOME}/.x2go/C-"+
resumingSession.sessionId+
- "/.pulse-client.conf"
- ";echo \\\"cookie-file=${HOME}/.x2go/C-"+
+ "/.pulse-client.conf\""
+ ";echo \"cookie-file=${HOME}/.x2go/C-"+
resumingSession.sessionId+
"/.pulse-cookie"+
- "\\\" >> ${HOME}/.x2go/C-"+
+ "\" >> \"${HOME}/.x2go/C-"+
resumingSession.sessionId+
- "/.pulse-client.conf";
+ "/.pulse-client.conf\"";
sshConnection->executeCommand(scmd);
@@ -6292,9 +6292,9 @@ void ONMainWindow::runCommand()
sessionType +" 1> /dev/null 2>/dev/null & exit";
if ( startSessSndSystem ==PULSE )
{
- cmd="export PULSE_CLIENTCONFIG=\\\"${HOME}/.x2go/C-"+
+ cmd="export PULSE_CLIENTCONFIG=\"${HOME}/.x2go/C-"+
resumingSession.sessionId+
- "/.pulse-client.conf\\\";"+cmd;
+ "/.pulse-client.conf\";"+cmd;
}
}
else
@@ -6338,8 +6338,8 @@ void ONMainWindow::runCommand()
void ONMainWindow::runApplication(QString exec)
{
- sshConnection->executeCommand ("PULSE_CLIENTCONFIG=\\\"${HOME}/.x2go/C-"+
- resumingSession.sessionId+"/.pulse-client.conf\\\" DISPLAY=:"+
+ sshConnection->executeCommand ("PULSE_CLIENTCONFIG=\"${HOME}/.x2go/C-"+
+ resumingSession.sessionId+"/.pulse-client.conf\" DISPLAY=:"+
resumingSession.display+
" setsid "+exec+" 1> /dev/null 2>/dev/null & exit");
}
@@ -11505,9 +11505,9 @@ void ONMainWindow::slotStartParec ()
QString passwd=getCurrentPass();
QString user=getCurrentUname();
QString host=resumingSession.server;
- QString scmd="PULSE_CLIENTCONFIG=\\\"${HOME}/.x2go/C-"+
+ QString scmd="PULSE_CLIENTCONFIG=\"${HOME}/.x2go/C-"+
resumingSession.sessionId+
- "/.pulse-client.conf\\\" "+
+ "/.pulse-client.conf\" "+
"parec 1> /dev/null & sleep 1 && kill %1";
}
#endif
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list