diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-10-15 18:58:11 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-10-15 18:58:21 +0200 |
| commit | a1ff2d63157dcfececfa14f49b355a9a22d525cb (patch) | |
| tree | db8efb17304610e2dec150e9b7523c4075b77230 /kopete/protocols/jabber/ui | |
| parent | f94fdac5294c571ec83faf89949159cdb609fbd6 (diff) | |
| download | tdenetwork-a1ff2d63157dcfececfa14f49b355a9a22d525cb.tar.gz tdenetwork-a1ff2d63157dcfececfa14f49b355a9a22d525cb.zip | |
Kopete - jabber: Not force old XMPP protocol
This resolves bug 698
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2a0baddda5436cb80d40c5166be42a6c84b90ab3)
Diffstat (limited to 'kopete/protocols/jabber/ui')
| -rw-r--r-- | kopete/protocols/jabber/ui/jabberregisteraccount.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index febad40c..f3d01c76 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -250,13 +250,16 @@ void JabberRegisterAccount::slotOk () // cancel any previous attempt jabberClient->disconnect (); - // FIXME: we need to use the old protocol for now - jabberClient->setUseXMPP09 ( true ); - jabberClient->setUseSSL ( mMainWidget->cbUseSSL->isChecked () ); - // FIXME: check this when using the new protocol - jabberClient->setOverrideHost ( true, mMainWidget->leServer->text (), mMainWidget->sbPort->value () ); + if( !mMainWidget->leServer->text().isEmpty() ) { + jabberClient->setUseXMPP09 ( true ); + jabberClient->setOverrideHost ( true, mMainWidget->leServer->text (), mMainWidget->sbPort->value () ); + } + else { + jabberClient->setUseXMPP09 ( false ); + jabberClient->setOverrideHost ( false ); + } // start connection, no authentication switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), TQString(), false ) ) |