This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 5bd460f299c6cb5bf27bdc67da80dee55b4c0293 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 10 22:34:58 2017 +0100 src/onmainwindow.cpp: finally include version information in debug output. --- debian/changelog | 2 ++ src/httpbrokerclient.cpp | 2 ++ src/onmainwindow.cpp | 4 +++- src/sshmasterconnection.cpp | 3 +++ src/sshmasterconnection.h | 3 ++- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5a04c84..4501d84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium continues via challenge auth or plain passwords, but since users had no chance to input a password, such authentication will always fail. Give users a way to enter passwords, in case the auto-login failed. + - src/onmainwindow.cpp: finally include version information in debug + output. [ Oleksandr Shneyder ] * Change echo mode for user input in InteractionDialog. diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp index 1540e98..96245f5 100644 --- a/src/httpbrokerclient.cpp +++ b/src/httpbrokerclient.cpp @@ -90,6 +90,8 @@ void HttpBrokerClient::createSshConnection() config->brokerUser, config->brokerPass,config->brokerSshKey,config->brokerAutologin, config->brokerKrbLogin, false); + qRegisterMetaType<SshMasterConnection::passphrase_types> ("SshMasterConnection::passphrase_types"); + connect ( sshConnection, SIGNAL ( connectionOk(QString)), this, SLOT ( slotSshConnectionOk() ) ); connect ( sshConnection, SIGNAL ( serverAuthError ( int,QString, SshMasterConnection* ) ),this, SLOT ( slotSshServerAuthError ( int,QString, SshMasterConnection* ) ) ); diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index cd6cab5..bffb9ef 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -58,7 +58,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) #ifdef Q_OS_LINUX image=shape=0; #endif - x2goInfof(1) << tr("Starting X2Go Client..."); + x2goInfof(1) << tr("Starting X2Go Client %1...").arg (QString (VERSION)); debugging = false; setFocusPolicy ( Qt::NoFocus ); @@ -2987,6 +2987,8 @@ SshMasterConnection* ONMainWindow::startSshConnection ( QString host, QString po else connect ( con, SIGNAL ( connectionOk(QString)), this, SLOT ( slotServSshConnectionOk(QString) ) ); + qRegisterMetaType<SshMasterConnection::passphrase_types> ("SshMasterConnection::passphrase_types"); + connect ( con, SIGNAL ( serverAuthError ( int,QString, SshMasterConnection* ) ),this, SLOT ( slotSshServerAuthError ( int,QString, SshMasterConnection* ) ) ); connect ( con, SIGNAL ( needPassPhrase(SshMasterConnection*, SshMasterConnection::passphrase_types)),this, diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index fb0dee8..0cfb5d8 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -524,6 +524,9 @@ void SshMasterConnection::run() x2goDebug << "proxyserver: " << proxyserver << "; proxyport: " << proxyport << "; proxylogin: " << proxylogin; sshProxy=new SshMasterConnection (0, proxyserver, proxyport,acceptUnknownServers, proxylogin, proxypassword, proxykey, proxyautologin, proxyKrbLogin, false); + + qRegisterMetaType<SshMasterConnection::passphrase_types> ("SshMasterConnection::passphrase_types"); + connect ( sshProxy, SIGNAL ( connectionOk(QString) ), this, SLOT ( slotSshProxyConnectionOk() ) ); connect ( sshProxy, SIGNAL ( serverAuthError ( int,QString,SshMasterConnection* ) ),this, diff --git a/src/sshmasterconnection.h b/src/sshmasterconnection.h index 6f4a442..ad6776b 100644 --- a/src/sshmasterconnection.h +++ b/src/sshmasterconnection.h @@ -236,13 +236,14 @@ signals: void connectionOk( QString host); - void needPassPhrase(SshMasterConnection*, passphrase_types); + void needPassPhrase(SshMasterConnection*, SshMasterConnection::passphrase_types); void needChallengeResponse(SshMasterConnection*, QString Challenge); void startInteraction(SshMasterConnection*, QString prompt); void finishInteraction(SshMasterConnection*); void updateInteraction(SshMasterConnection*, QString output); }; +Q_DECLARE_METATYPE (SshMasterConnection::passphrase_types) #endif // SSHMASTERCONNECTION_H -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git