[X2Go-Commits] [x2goclient] 247/257: src/onmainwindow.cpp: pass new ssh_key_type_ member to startSshd () call in WinServerStarter::run ().
git-admin at x2go.org
git-admin at x2go.org
Mon Nov 28 16:06:34 CET 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 6b073294628be07db2e49973f5d1e525c631591e
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Oct 26 19:13:15 2016 +0200
src/onmainwindow.cpp: pass new ssh_key_type_ member to startSshd () call in WinServerStarter::run ().
---
debian/changelog | 2 ++
src/onmainwindow.cpp | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 2f2fa02..2d79b59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -442,6 +442,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
- src/onmainwindow.{cpp,h}: add ssh_key_type_ member variable and getter
and setter to WinServerStarter class.
- src/onmainwindow.{cpp,h}: add SSH key type parameter to startSshd ().
+ - src/onmainwindow.cpp: pass new ssh_key_type_ member to startSshd () call
+ in WinServerStarter::run ().
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index ff0d8e6..1cd99cb 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -9960,7 +9960,7 @@ void WinServerStarter::run()
switch ( mode )
{
case SSH:
- parent->startSshd();
+ parent->startSshd(ssh_key_type_);
break;
case X:
parent->startXOrg();
--
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