[X2Go-Commits] [x2goclient] 205/219: src/onmainwindow.cpp: fix compile error on Windows after moving some code around.
git-admin at x2go.org
git-admin at x2go.org
Thu Sep 22 04:37:37 CEST 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 5df0171c96e516a8b9f570749cc2c83e25a34a89
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Jul 4 23:03:57 2016 +0200
src/onmainwindow.cpp: fix compile error on Windows after moving some code around.
---
debian/changelog | 2 ++
src/onmainwindow.cpp | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 0f350d3..0c19070 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -348,6 +348,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
initialization in Windows-only code.
- src/onmainwindow.cpp: add another pair of braces to in_addr-type
variable initialization on Windows to silence compiler warning.
+ - src/onmainwindow.cpp: fix compile error on Windows after moving some
+ code around.
-- X2Go Release Manager <git-admin at x2go.org> Mon, 19 Sep 2016 09:07:07 +0200
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 3d92993..20be146 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10243,7 +10243,7 @@ void ONMainWindow::generateEtcFiles()
"AuthorizedKeysFile \"" << authKeyPath << "\"\n" <<
#ifdef Q_OS_WIN
"Subsystem shell "<< wapiShortFileName ( appDir) +"/sh"+"\n"<<
- "Subsystem sftp "<< wapiShortFileName ( appDir) +"/sftp-server"+"\n"<<
+ "Subsystem sftp "<< wapiShortFileName ( appDir) +"/sftp-server"+"\n";
#else
"Subsystem sftp "
/* This may need some sanitization, i.e., appDir could potentially include whitespace. */
--
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