rpms/kdenetwork/F-10 kdenetwork-4.2.0-handle-enc-message.patch, NONE, 1.1 kdenetwork.spec, 1.162, 1.163

[Jaroslav Reznik]

Author: jreznik

Update of /cvs/pkgs/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8783

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.2.0-handle-enc-message.patch 
Log Message:
fix kopete jabber protocol encrypted messages handling (#473412)


kdenetwork-4.2.0-handle-enc-message.patch:

--- NEW FILE kdenetwork-4.2.0-handle-enc-message.patch ---
diff -up kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp.handle-enc-message kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp
--- kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp.handle-enc-message	2008-11-19 11:19:43.000000000 +0100
+++ kdenetwork-4.2.0/kopete/protocols/jabber/jabbercontact.cpp	2009-01-26 14:12:35.000000000 +0100
@@ -51,6 +51,7 @@
 #include "kopetechatsessionmanager.h"
 #include "kopeteaccountmanager.h"
 #include "kopetemetacontact.h"
+#include "kopetepluginmanager.h"
 #include "jabberprotocol.h"
 #include "jabberaccount.h"
 #include "jabberclient.h"
@@ -392,9 +393,15 @@ void JabberContact::handleIncomingMessag
 		QString body = message.body ();
 		if( !message.xencrypted().isEmpty() )
 		{
-			body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			kDebug ( JABBER_DEBUG_GLOBAL ) << "Received encrypted message";
+			if (Kopete::PluginManager::self()->plugin("kopete_cryptography"))
+			{
+				kDebug( JABBER_DEBUG_GLOBAL ) << "Kopete cryptography plugin loaded";
+				body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			}
 		}
-		else if( message.containsHTML() )
+
+		if( message.containsHTML() )
 		{
 			kDebug ( JABBER_DEBUG_GLOBAL ) << "Received a xHTML message";
 			newMessage = new Kopete::Message ( this, contactList );
diff -up kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp.handle-enc-message kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp
--- kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp.handle-enc-message	2008-10-09 11:48:21.000000000 +0200
+++ kdenetwork-4.2.0/kopete/protocols/jabber/jabbergroupcontact.cpp	2009-01-26 14:12:35.000000000 +0100
@@ -32,6 +32,7 @@
 #include "jabbergroupmembercontact.h"
 #include "jabbercontactpool.h"
 #include "kopetemetacontact.h"
+#include "kopetepluginmanager.h"
 #include "xmpp_tasks.h"
 
 /**
@@ -181,7 +182,11 @@ void JabberGroupContact::handleIncomingM
 
 		if( !message.xencrypted().isEmpty () )
 		{
-			body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			if (Kopete::PluginManager::self()->plugin("kopete_cryptography"))
+			{
+				kDebug( JABBER_DEBUG_GLOBAL ) << "Kopete cryptography plugin loaded";
+				body = QString ("-----BEGIN PGP MESSAGE-----\n\n") + message.xencrypted () + QString ("\n-----END PGP MESSAGE-----\n");
+			}
 		}
 
 		// locate the originating contact


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- kdenetwork.spec	24 Jan 2009 17:45:09 -0000	1.162
+++ kdenetwork.spec	26 Jan 2009 14:45:45 -0000	1.163
@@ -2,12 +2,13 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0: kdenetwork-4.2.0-handle-enc-message.patch
 # build Kopete against the system libgadu (backported from 4.3)
 # http://websvn.kde.org/?view=rev&revision=909144
 # http://websvn.kde.org/?view=rev&revision=909145
@@ -87,6 +88,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .handle-enc-message
 %patch100 -p0 -b .system-libgadu
 rm -rf kopete/protocols/gadu/libgadu/
 
@@ -162,6 +164,9 @@
 
 
 %changelog
+* Mon Jan 26 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-2
+- fix kopete jabber protocol encrypted messages handling (#473412)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0