rpms/kdenetwork/F-9 kdenetwork-4.1.0-kopete-jabber-ssl.patch, NONE, 1.1 kdenetwork.spec, 1.143, 1.144

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26245

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.1.0-kopete-jabber-ssl.patch 
Log Message:
- #432132: fix Jabber unable to connect to Google Talk, kde#154940


kdenetwork-4.1.0-kopete-jabber-ssl.patch:

--- NEW FILE kdenetwork-4.1.0-kopete-jabber-ssl.patch ---
--- kdenetwork/kopete/protocols/jabber/jabberclient.cpp	2008/05/20 15:10:31	810375
+++ kdenetwork/kopete/protocols/jabber/jabberclient.cpp	2008/05/20 15:10:46	810376
@@ -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 () ) );
 	}
 
 	/*


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- kdenetwork.spec	23 May 2008 12:20:32 -0000	1.143
+++ kdenetwork.spec	31 May 2008 11:18:25 -0000	1.144
@@ -6,7 +6,7 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License:   GPLv2
 Group:     Applications/Internet
@@ -17,6 +17,7 @@
 # upstream patches
 Patch100: kdenetwork-4.0.4-kopete-chatwindow-crash.patch 
 Patch101: kdenetwork-4.0.4-kopete-save-crash.patch
+Patch102: kdenetwork-4.1.0-kopete-jabber-ssl.patch
 
 BuildRequires: avahi-compat-libdns_sd-devel
 BuildRequires: boost-devel
@@ -89,6 +90,7 @@
 %setup -q
 %patch100 -p1 -b .kopete-chatwindow-crash
 %patch101 -p1 -b .kopete-save-crash
+%patch102 -p1 -b .kopete-jabber-ssl
 
 %build
 mkdir -p %{_target_platform}
@@ -164,6 +166,9 @@
 
 
 %changelog
+* Sat May 31 2008 Lukáš Tinkl <ltinkl at redhat.com>
+- #432132: fix Jabber unable to connect to Google Talk, kde#154940
+
 * Fri May 23 2008 Than Ngo <than at redhat.com> -  4.0.4-3
 - Do not crash if no view plugin can be loaded, kde#161078