This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit c8434021d8f7ba1a406b94ec2a02b8ca15b70b60 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Oct 26 20:36:14 2016 +0200 src/onmainwindow.h: move WinServerStarter class definition around to hopefully get the definition of ONMainWindow::key_types. --- debian/changelog | 2 ++ src/onmainwindow.h | 35 +++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8417bda..c468a22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -450,6 +450,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium startWinServers (). - src/onmainwindow.cpp: actually use key_type parameter in startSshd () and make selection more generic. + - src/onmainwindow.h: move WinServerStarter class definition around to + hopefully get the definition of ONMainWindow::key_types. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/onmainwindow.h b/src/onmainwindow.h index f9a9e4b..840ea83 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -247,22 +247,6 @@ class WWrapper : public QPushButton { friend class ONMainWindow; }; -#include <QThread> -#include <QMutex> -class ONMainWindow; -class WinServerStarter: public QThread -{ -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 @@ -1269,4 +1253,23 @@ private slots: ////////////////end of plugin stuff//////////////////// }; +#ifdef Q_OS_WIN +#include <QThread> +#include <QMutex> +class ONMainWindow; +class WinServerStarter: public QThread +{ +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; + ONMainWindow::key_types ssh_key_type_ = RSA_KEY_TYPE; +}; +#endif + #endif -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git