This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 7b69d4cf757bba1a6ee75384577669bbacd5d7c1 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Oct 11 06:32:06 2014 -0400 Apply bug566.aid-debugging.patch from George Trakatelis (uom.edu.gr) --- debian/changelog | 1 + sshmasterconnection.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ef993ed..3c14ab5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,7 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low language as the Windows "system locale" AKA "Language for non-Unicode programs." Bug #611 was written for fixing the issue for languages other than the system locale.) + Thanks George Trakatelis (uom.edu.gr) for submitting part of this fix. - Windows: Install VcXsrv "misc" fonts by default, and make all 4 font groups optional: misc, 75dpi, 100dpi and others (Fixes: #108) Note: The fact that all the fonts are included makes the installer about diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 8c89194..c3f78d7 100755 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -519,6 +519,9 @@ void SshMasterConnection::run() #ifdef Q_OS_WIN ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit()); +#ifdef DEBUG + x2goDebug<<"setting SSH DIR to "<<(mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit(); +#endif if (kerberos) { parseKnownHosts(); @@ -635,7 +638,7 @@ void SshMasterConnection::run() #ifdef Q_OS_WIN ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit()); #ifdef DEBUG - x2goDebug<<"setting SSH DIR to "<<mainWnd->getHomeDirectory()+"/ssh"; + x2goDebug<<"setting SSH DIR to "<<(mainWnd->getHomeDirectory()+"/ssh").toLocal8Bit(); #endif #endif -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git