This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/general in repository x2goclient. commit ffc56f31e2857b7ba7cb577fa67f3a94b9216c77 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 10 16:48:12 2015 +0100 onmainwindow.{cpp,h}: make slotTunnelOk parameter optional and use the non-parameter call for the QSingleShotTimer::timeout() signal. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 2 +- src/onmainwindow.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a2b3ba1..5663934 100644 --- a/debian/changelog +++ b/debian/changelog @@ -192,6 +192,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low errors relating to missing sshd host keys. Fixes: #794. - onmainwindow.cpp: also make the message about a non-running sshd non-modal. + - onmainwindow.{cpp,h}: make slotTunnelOk parameter optional and use the + non-parameter call for the QSingleShotTimer::timeout() signal. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index fad2cb7..5ff646b 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -5175,7 +5175,7 @@ void ONMainWindow::slotTunnelOk(int) x2goDebug<<"Waiting for win-servers."; - QTimer::singleShot ( 100, this, SLOT ( slotTunnelOk(int) ) ); + QTimer::singleShot ( 100, this, SLOT ( slotTunnelOk() ) ); return; } #endif diff --git a/src/onmainwindow.h b/src/onmainwindow.h index e1b68dc..dcc938c 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -1050,7 +1050,7 @@ private slots: void slotSndTunnelFailed ( bool result,QString output, int ); void slotCopyKey ( bool result,QString output,int ); - void slotTunnelOk(int ); + void slotTunnelOk(int = 0); void slotFsTunnelOk(int ); void slotProxyError ( QProcess::ProcessError err ); void slotProxyFinished ( int result,QProcess::ExitStatus st ); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git