This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 1c60cad86f5ff4034ee8630cbc20dd513828dc88 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 4 01:23:31 2015 +0200 onmainwindow.cpp: fix compile error - use QString.toAscii () to get a valid C string representation for tr (). --- debian/changelog | 2 ++ src/onmainwindow.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f74f80f..135974d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,8 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low - onmainwindow.cpp: silence another compiler warning by not converting from string to int and back to string needlessly. Just use the string. No need for an OS X-specific variable anymore. + - onmainwindow.cpp: fix compile error - use QString.toAscii () to get a + valid C string representation for tr (). -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 May 2015 21:42:09 +0200 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index e79e73a..c3f87c3 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -11664,7 +11664,7 @@ void ONMainWindow::printSshDError_noHostPubKey() "<ul>" "<li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li>" - "<li>Run this command: <b>ssh -p " + clientSshPort + "<li>Run this command: <b>ssh -p " + clientSshPort.toAscii () + " localhost</b></li>" "<li>You do not need to login. Just quit the Terminal application " "via Cmd + Q</li>" -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git