By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Not force old XMPP protocol

bp002-kopete-jabber-not-force-old-protocol.diff (text/plain), 3.39 KB, created by Slávek Banko on 2016-10-08 14:18:54 CDT

(hide)

Description: Not force old XMPP protocol

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2016-10-08 14:18:54 CDT

Size: 3.39 KB

patch

obsolete

>diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp >index 06ec227..4cc2c86 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 ) ); >diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp >index c309124..470a9f2 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 ); >diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp >index febad40..f3d01c7 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 ) ) View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]