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/tdeioslave/jabberdisco.cpp | |
| 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/tdeioslave/jabberdisco.cpp')
| -rw-r--r-- | kopete/protocols/jabber/tdeioslave/jabberdisco.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp index c3091248..470a9f2e 100644 --- a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp @@ -90,14 +90,18 @@ void JabberDiscoProtocol::openConnection () m_jabberClient->disconnect (); } - // we need to use the old protocol for now - m_jabberClient->setUseXMPP09 ( true ); - // set SSL flag (this should be converted to forceTLS when using the new protocol) m_jabberClient->setUseSSL ( false ); // override server and port (this should be dropped when using the new protocol and no direct SSL) - m_jabberClient->setOverrideHost ( true, m_host, m_port ); + if( !m_host.isEmpty() ) { + m_jabberClient->setUseXMPP09 ( true ); + m_jabberClient->setOverrideHost ( true, m_host, m_port ); + } + else { + m_jabberClient->setUseXMPP09 ( false ); + m_jabberClient->setOverrideHost ( false ); + } // allow plaintext password authentication or not? m_jabberClient->setAllowPlainTextPassword ( false ); |