[X2Go-Commits] [x2goclient] 247/267: src/onmainwindow.cpp: pass new ssh_key_type_ member to startSshd () call in WinServerStarter::run ().

[git-admin at x2go.org]

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

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

commit af4f445a8e9fba38d12a0ac925a18609fa02ebd7
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 14d7e4e..567730b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -444,6 +444,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 7ab7196..5fa7424 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