From kde-commits  Tue May 20 15:10:46 2008
From: Detlev Casanova <detlev.casanova () gmail ! com>
Date: Tue, 20 May 2008 15:10:46 +0000
To: kde-commits
Subject: KDE/kdenetwork/kopete/protocols/jabber
Message-Id: <1211296246.537653.24870.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=121129630525632

SVN commit 810376 by casanova:

 * Trusted certificates must be set before creating the TLS Handler.
 * This should solve bug #154940. Waiting for feedbacks before closing the bug report.


 M  +5 -8      jabberclient.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberclient.cpp #810375:810376
@@ -25,6 +25,7 @@
 #include <QTimer>
 #include <QRegExp>
 #include <QtCrypto>
+#include <QDir>
 
 #include <bsocket.h>
 #include <filetransfer.h>
@@ -646,15 +647,11 @@
 	if ( QCA::isSupported ("tls") )
 	{
 		d->jabberTLS = new QCA::TLS;
-		d->jabberTLSHandler = new XMPP::QCATLSHandler ( d->jabberTLS );
+		d->jabberTLS->setTrustedCertificates(QCA::systemStore());
+		d->jabberTLSHandler = new QCATLSHandler(d->jabberTLS);
+		d->jabberTLSHandler->setXMPPCertCheck(true);
 
-		{
-			using namespace XMPP;
-			QObject::connect ( d->jabberTLSHandler, SIGNAL ( tlsHandshaken() ), this, SLOT ( slotTLSHandshaken () ) );
-		}
-
-		if( QCA::haveSystemStore() )
-			d->jabberTLS->setTrustedCertificates( QCA::systemStore() );
+		QObject::connect ( d->jabberTLSHandler, SIGNAL ( tlsHandshaken() ), SLOT ( slotTLSHandshaken () ) );
 	}
 
 	/*