[X2Go-Commits] [x2goclient] 16/18: src/sshmasterconnection.cpp: fix up some debug strings.
git-admin at x2go.org
git-admin at x2go.org
Wed Feb 8 20:50:27 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.
commit bd335f0d9ea19019ee91a5f0c5ac6112c606da39
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Feb 2 06:56:32 2017 +0100
src/sshmasterconnection.cpp: fix up some debug strings.
---
debian/changelog | 1 +
src/sshmasterconnection.cpp | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2b3098f..058393e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -609,6 +609,7 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
- src/sshmasterconnection.cpp: use QString::arg () to insert function name
and thus deduplicate error translation messages. Also re-add the full
stop sign and remove it when needed for x2goDebug.
+ - src/sshmasterconnection.cpp: fix up some debug strings.
[ Bernard Cafarelli ]
* New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 6469cd7..c2e8659 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -173,9 +173,9 @@ SshMasterConnection::SshMasterConnection (QObject* parent, QString host, int por
breakLoop=false;
kerberosDelegation=false;
- x2goDebug << "SshMasterConnection, host " << host << "port " << port << "user " << user
- << "useproxy " << useproxy << "proxyserver " << proxyserver
- << "proxyport " << proxyport;
+ x2goDebug << "SshMasterConnection, host " << host << "; port " << port << "; user " << user
+ << "; useproxy " << useproxy << "; proxyserver " << proxyserver
+ << "; proxyport " << proxyport;
this->host=host;
this->port=port;
this->user=user;
@@ -467,7 +467,7 @@ void SshMasterConnection::run()
#endif
if(useproxy && proxytype==PROXYSSH)
{
- x2goDebug << "proxyserver: " << proxyserver << "proxyport: " << proxyport << "proxylogin: " << proxylogin;
+ x2goDebug << "proxyserver: " << proxyserver << "; proxyport: " << proxyport << "; proxylogin: " << proxylogin;
sshProxy=new SshMasterConnection (0, proxyserver, proxyport,acceptUnknownServers,
proxylogin, proxypassword, proxykey, proxyautologin, proxyKrbLogin, false);
connect ( sshProxy, SIGNAL ( connectionOk(QString) ), this, SLOT ( slotSshProxyConnectionOk() ) );
--
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