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:11 +0200 |
| commit | 2a0baddda5436cb80d40c5166be42a6c84b90ab3 (patch) | |
| tree | f610dcf976b8d46662c0768994c2d18ecb7e0675 /kopete/protocols/jabber/jabberaccount.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 <slavek.banko@axis.cz>
Diffstat (limited to 'kopete/protocols/jabber/jabberaccount.cpp')
| -rw-r--r-- | kopete/protocols/jabber/jabberaccount.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index 06ec2279..4cc2c866 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -335,14 +335,18 @@ void JabberAccount::connectWithPassword ( const TQString &password ) 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 ( configGroup()->readBoolEntry ( "UseSSL", false ) ); // override server and port (this should be dropped when using the new protocol and no direct SSL) - m_jabberClient->setOverrideHost ( true, server (), port () ); + if( configGroup()->readBoolEntry ( "CustomServer", false ) ) { + m_jabberClient->setUseXMPP09 ( true ); + m_jabberClient->setOverrideHost ( true, server (), port () ); + } + else { + m_jabberClient->setUseXMPP09 ( false ); + m_jabberClient->setOverrideHost ( false ); + } // allow plaintext password authentication or not? m_jabberClient->setAllowPlainTextPassword ( configGroup()->readBoolEntry ( "AllowPlainTextPassword", false ) ); |