This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 9e46b6a0d64b3612c8f63148fcc0ffc32c04e68e Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Oct 26 19:04:50 2016 +0200 src/onmainwindow.{cpp,h}: add ssh_key_type_ member variable and getter and setter to WinServerStarter class. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 7 +++++++ src/onmainwindow.h | 3 +++ 3 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index ec8ba5e..c9bfe3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -441,6 +441,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium code of startSshd (). - src/onmainwindow.{cpp,h}: make startSshd () private. There's no need to keep it public, as only class-internal functions are using it. + - src/onmainwindow.{cpp,h}: add ssh_key_type_ member variable and getter + and setter to WinServerStarter class. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 17db351..4ec72bd 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -9968,6 +9968,13 @@ void WinServerStarter::run() } } +void WinServerStarter::set_ssh_key_type (ONMainWindow::key_types key_type) { + ssh_key_type_ = key_type; +} + +ONMainWindow::key_types WinServerStarter::get_ssh_key_type () { + return (ssh_key_type_); +} void ONMainWindow::startWinServers() diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 3139efd..f6b365c 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -256,9 +256,12 @@ public: enum daemon {X,SSH}; WinServerStarter ( daemon server, ONMainWindow * par ); void run(); + void set_ssh_key_type (ONMainWindow::key_types key_type); + ONMainWindow::key_types get_ssh_key_type (); private: daemon mode; ONMainWindow* parent; + key_types ssh_key_type_ = RSA_KEY_TYPE; }; #endif -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git