This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 4eb1fd1 Disallow server-side users to override X2Go Server commands via ~/bin (or similar). (Fixes: #336). new 2531d56 Save proxy output in $HOME/S-$SESSION-ID/session.log if debugging is enabled. 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: debian/changelog | 1 + onmainwindow.cpp | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 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 2531d562b8a8669f1f4ebd205b5f68a314107051 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Tue Jun 24 11:42:25 2014 +0200 Save proxy output in $HOME/S-$SESSION-ID/session.log if debugging is enabled. --- debian/changelog | 1 + onmainwindow.cpp | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 14f29b6..349f8ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low - Check if sound is activated before starting pulse. - Fix starting sshd on Win XP. (Fixes: #421). - Fork x2goclient on windows and terminate child processes if x2go client crashed. + - Save proxy output in $HOME/S-$SESSION-ID/session.log if debugging is enabled. [ Mike DePaulo ] * New upstream release (4.0.2.1): - Windows: Enable PulseAudio log when --debug is passed. diff --git a/onmainwindow.cpp b/onmainwindow.cpp index b6eed49..99742e2 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -5758,6 +5758,14 @@ void ONMainWindow::slotProxyStderr() x2goDebug<<"Proxy wrote on stderr: "<<reserr; + if(debugging) + { + QFile fl(homeDir+"/.x2go/S-"+resumingSession.sessionId+"/session.log"); + fl.open(QIODevice::WriteOnly|QIODevice::Append); + fl.write(reserr.toLocal8Bit()); + fl.close(); + } + stInfo->insertPlainText ( reserr ); stInfo->ensureCursorVisible(); if ( stInfo->toPlainText().indexOf ( @@ -9789,7 +9797,7 @@ void ONMainWindow::startPulsed() pulseArgs<<"--exit-idle-time=-1"<<"-n"<<"-F"<<pulseDir+"/config.pa"; #endif pulseServer->setWorkingDirectory ( QDir::toNativeSeparators ( - wapiShortFileName ( appDir+"/pulse/" ) ) ); + wapiShortFileName ( appDir+"/pulse/" ) ) ); pulseServer->start ( "pulse\\pulseaudio.exe",pulseArgs ); x2goDebug<<"Starting pulse\\pulseaudio.exe "<<pulseArgs.join ( " " ) << @@ -10212,8 +10220,8 @@ void ONMainWindow::slotConfigXinerama() xineramaTimer->stop(); QStringList screens; foreach (QRect disp, xineramaScreens) - screens<<QString::number(disp.x())+" "+QString::number(disp.y())+" "+QString::number(disp.width())+ - " "+QString::number(disp.height()); + screens<<QString::number(disp.x())+" "+QString::number(disp.y())+" "+QString::number(disp.width())+ + " "+QString::number(disp.height()); QString cmd="export DISPLAY=:"+resumingSession.display+";printf '"+screens.join("\\\\n")+"' > $HOME/.x2go/C-"+ resumingSession.sessionId+"/xinerama.conf"; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git