[X2Go-Commits] [x2goclient] 205/280: src/onmainwindow.cpp: fix compile error on Windows after moving some code around.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 18 12:25:54 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 90c0da3fba1eea29e2247c5c5ad651e0a10a1c99
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 2c91924..16ea631 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -374,6 +374,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.
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 3eba34c..180c785 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10302,7 +10302,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