[X2Go-Commits] [x2goclient] 02/02: src/onmainwindow.cpp: fix compile error on Windows after moving some code around.

git-admin at x2go.org git-admin at x2go.org
Mon Jul 4 23:04:17 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 4a90cc2bdf7157b3b6359e366730aad5ae03542a
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 6a5acd5..bd40313 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -375,6 +375,8 @@ x2goclient (4.0.5.2-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.
   * debian/control:
     - Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
     - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index b883f7b..3fbdaeb 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10225,7 +10225,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