This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 56afe6ac1145f1c2fedcd09895b2a69b279faf2e Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Oct 26 20:47:32 2016 +0200 src/onmainwindow.h: actually, we do need startSshd () to be public. Move it back. --- debian/changelog | 2 ++ src/onmainwindow.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ffcbe38..1e9ce34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -463,6 +463,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium directly. - src/onmainwindow.cpp: re-order initializer list of WinServerStarter constructor. + - src/onmainwindow.h: actually, we do need startSshd () to be public. Move + it back. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 144241f..433dfad 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -561,6 +561,7 @@ public: QString internAppName ( const QString& transAppName, bool* found=0l ); void setEmbedSessionActionsEnabled ( bool enable ); + bool startSshd (key_types key_type = RSA_KEY_TYPE); QSize getEmbedAreaSize(); #ifdef Q_OS_WIN static QString cygwinPath ( const QString& winPath ); @@ -1197,7 +1198,6 @@ private: std::size_t default_size_for_key_type (key_types key_type); QString generateKey (key_types key_type, bool host_key = false); QString createKeyBundle (key_types key_type = RSA_KEY_TYPE); - bool startSshd (key_types key_type = RSA_KEY_TYPE); ////////////////plugin stuff//////////////////// #ifdef CFGPLUGIN -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git