diff options
| author | Slávek Banko <[email protected]> | 2016-10-15 18:58:11 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2016-10-15 18:58:11 +0200 |
| commit | 2a0baddda5436cb80d40c5166be42a6c84b90ab3 (patch) | |
| tree | f610dcf976b8d46662c0768994c2d18ecb7e0675 /kopete/protocols/jabber/ui/jabberregisteraccount.cpp | |
| parent | a9aee0e6e0157a1fbeba6433aaaeda584698dc4e (diff) | |
| download | tdenetwork-2a0baddda5436cb80d40c5166be42a6c84b90ab3.tar.gz tdenetwork-2a0baddda5436cb80d40c5166be42a6c84b90ab3.zip | |
Kopete - jabber: Not force old XMPP protocol
This resolves bug 698
Signed-off-by: Slávek Banko <[email protected]>
Diffstat (limited to 'kopete/protocols/jabber/ui/jabberregisteraccount.cpp')
| -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 ) ) |