Attachment #2720 for bug #698

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. View | Details | Raw Unified | Return to bug 698
Collapse All | Expand All




		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)
	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 ) );




		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)
	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 );




	// cancel any previous attempt
	jabberClient->disconnect ();

	// FIXME: we need to use the old protocol for now
	jabberClient->setUseXMPP09 ( true );

	jabberClient->setUseSSL ( mMainWidget->cbUseSSL->isChecked () );

	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 ) )

Return to bug 698

Lines 335-348 void JabberAccount::connectWithPassword ( const TQString &password ) Link Here

(-)a/kopete/protocols/jabber/jabberaccount.cpp (-4 / +8 lines)
335	m_jabberClient->disconnect ();	335	m_jabberClient->disconnect ();
336	}	336	}
337		337
338	// we need to use the old protocol for now
339	m_jabberClient->setUseXMPP09 ( true );
340
341	// set SSL flag (this should be converted to forceTLS when using the new protocol)	338	// set SSL flag (this should be converted to forceTLS when using the new protocol)
342	m_jabberClient->setUseSSL ( configGroup()->readBoolEntry ( "UseSSL", false ) );	339	m_jabberClient->setUseSSL ( configGroup()->readBoolEntry ( "UseSSL", false ) );
343		340
344	// override server and port (this should be dropped when using the new protocol and no direct SSL)	341	// override server and port (this should be dropped when using the new protocol and no direct SSL)
345	m_jabberClient->setOverrideHost ( true, server (), port () );	342	if( configGroup()->readBoolEntry ( "CustomServer", false ) ) {
		343	m_jabberClient->setUseXMPP09 ( true );
		344	m_jabberClient->setOverrideHost ( true, server (), port () );
		345	}
		346	else {
		347	m_jabberClient->setUseXMPP09 ( false );
		348	m_jabberClient->setOverrideHost ( false );
		349	}
346		350
347	// allow plaintext password authentication or not?	351	// allow plaintext password authentication or not?
348	m_jabberClient->setAllowPlainTextPassword ( configGroup()->readBoolEntry ( "AllowPlainTextPassword", false ) );	352	m_jabberClient->setAllowPlainTextPassword ( configGroup()->readBoolEntry ( "AllowPlainTextPassword", false ) );

Lines 90-103 void JabberDiscoProtocol::openConnection () Link Here

(-)a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp (-4 / +8 lines)
90	m_jabberClient->disconnect ();	90	m_jabberClient->disconnect ();
91	}	91	}
92		92
93	// we need to use the old protocol for now
94	m_jabberClient->setUseXMPP09 ( true );
95
96	// set SSL flag (this should be converted to forceTLS when using the new protocol)	93	// set SSL flag (this should be converted to forceTLS when using the new protocol)
97	m_jabberClient->setUseSSL ( false );	94	m_jabberClient->setUseSSL ( false );
98		95
99	// override server and port (this should be dropped when using the new protocol and no direct SSL)	96	// override server and port (this should be dropped when using the new protocol and no direct SSL)
100	m_jabberClient->setOverrideHost ( true, m_host, m_port );	97	if( !m_host.isEmpty() ) {
		98	m_jabberClient->setUseXMPP09 ( true );
		99	m_jabberClient->setOverrideHost ( true, m_host, m_port );
		100	}
		101	else {
		102	m_jabberClient->setUseXMPP09 ( false );
		103	m_jabberClient->setOverrideHost ( false );
		104	}
101		105
102	// allow plaintext password authentication or not?	106	// allow plaintext password authentication or not?
103	m_jabberClient->setAllowPlainTextPassword ( false );	107	m_jabberClient->setAllowPlainTextPassword ( false );

Lines 250-262 void JabberRegisterAccount::slotOk () Link Here

(-)a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp (-5 / +8 lines)
250	// cancel any previous attempt	250	// cancel any previous attempt
251	jabberClient->disconnect ();	251	jabberClient->disconnect ();
252		252
253	// FIXME: we need to use the old protocol for now
254	jabberClient->setUseXMPP09 ( true );
255
256	jabberClient->setUseSSL ( mMainWidget->cbUseSSL->isChecked () );	253	jabberClient->setUseSSL ( mMainWidget->cbUseSSL->isChecked () );
257		254
258	// FIXME: check this when using the new protocol	255	if( !mMainWidget->leServer->text().isEmpty() ) {
259	jabberClient->setOverrideHost ( true, mMainWidget->leServer->text (), mMainWidget->sbPort->value () );	256	jabberClient->setUseXMPP09 ( true );
		257	jabberClient->setOverrideHost ( true, mMainWidget->leServer->text (), mMainWidget->sbPort->value () );
		258	}
		259	else {
		260	jabberClient->setUseXMPP09 ( false );
		261	jabberClient->setOverrideHost ( false );
		262	}
260		263
261	// start connection, no authentication	264	// start connection, no authentication
262	switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), TQString(), false ) )	265	switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), TQString(), false ) )