This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit fac1c7c8fb234efa22d4ab910c54ce69f3495025
Author: Mihai Moldovan <io...@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 b9daaf5..a2cdd46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -344,6 +344,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-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 741f8cd..d6900e9 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10239,7 +10239,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
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to