The branch, master has been updated via 8ba7c540ae8492624a753c3f32b1e49b658d4018 (commit) from c01d49db3afcbc028d704d3048f96fabee5827b4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8ba7c540ae8492624a753c3f32b1e49b658d4018 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Mon Nov 12 16:48:39 2012 +0100 fixed using uninitialized brokerType in X2GoBroker ----------------------------------------------------------------------- Summary of changes: x2gobroker.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2gobroker.cpp b/x2gobroker.cpp index ba34837..555f8ff 100644 --- a/x2gobroker.cpp +++ b/x2gobroker.cpp @@ -40,15 +40,16 @@ X2GoBroker::X2GoBroker(QObject* parent): QObject(parent) url = QUrl( urlString); if(url.userName().length()>0) user=url.userName(); + if(urlString.indexOf("ssh://")==0) + brokerType=SSH; + else + brokerType=HTTP; if(!cfg->get_defaultNoBrockerAuth().get_value().toBool() && brokerType==HTTP) { getLoginData(); } - if(urlString.indexOf("ssh://")==0) + if(brokerType==SSH) { - brokerType=SSH; -#warning search for default key hier - sshConnection=new SshConnection(this, url.host(), url.port(), cfg->get_autoAddToKnownHosts().get_value().toBool(), user, pass, cfg->get_brokerSSHKey().get_value().toString(), cfg->get_defaultBrockerAutoLogin().get_value().toBool()); @@ -59,7 +60,6 @@ X2GoBroker::X2GoBroker(QObject* parent): QObject(parent) } else { - brokerType=HTTP; http=new QHttp ( this ); if ( urlString.indexOf ( "https://" ) ==0 ) http->setHost ( url.host(),QHttp::ConnectionModeHttps, @@ -337,7 +337,7 @@ QString X2GoBroker::getHexVal(const QByteArray& ba) } -void X2GoBroker::slotSshConnectionError(int, QString message) +void X2GoBroker::slotSshConnectionError(int, QString) { X2GoApplication::exit(-1); } hooks/post-receive -- x2goclient2.git (X2Go Client 2 (rewrite of x2goclient.git)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient2.git" (X2Go Client 2 (rewrite of x2goclient.git)).