rev 5445 - in trunk/packages/kdepim/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-01-27 20:17:49 +0100 (Sat, 27 Jan 2007)
New Revision: 5445

Added:
   trunk/packages/kdepim/debian/patches/03_kmail-templates.patch
   trunk/packages/kdepim/debian/patches/04_kmail-140660.patch
Modified:
   trunk/packages/kdepim/debian/changelog
Log:
add patches sent to packagers


Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2007-01-27 19:00:30 UTC (rev 5444)
+++ trunk/packages/kdepim/debian/changelog	2007-01-27 19:17:49 UTC (rev 5445)
@@ -1,3 +1,12 @@
+kdepim (4:3.5.6.dfsg.1-2) experimental; urgency=low
+
+  * Add two patches pushed out from kde upstream
+    - one fixes a nasty crash when filtering messages that might lead to
+      dataloss
+    - one fixes some template related stuff
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Jan 2007 20:14:05 +0100
+
 kdepim (4:3.5.6.dfsg.1-1) experimental; urgency=low
 
   * New upstream release.

Added: trunk/packages/kdepim/debian/patches/03_kmail-templates.patch
===================================================================
--- trunk/packages/kdepim/debian/patches/03_kmail-templates.patch	2007-01-27 19:00:30 UTC (rev 5444)
+++ trunk/packages/kdepim/debian/patches/03_kmail-templates.patch	2007-01-27 19:17:49 UTC (rev 5445)
@@ -0,0 +1,20 @@
+--- kdepim/kmail/kmfolder.cpp	2006/10/28 17:04:18	599816
++++ kdepim/kmail/kmfolder.cpp	2007/01/27 00:32:53	627548
+@@ -631,11 +631,13 @@
+         mWhoField = "From";
+       if ( this == kmkernel->outboxFolder() ||
+            this == kmkernel->sentFolder() ||
+-           this == kmkernel->draftsFolder() )
++           this == kmkernel->draftsFolder() ||
++           this == kmkernel->templatesFolder() )
+         mWhoField = "To";
+-    } else if ( identity.drafts() == idString()
+-                || identity.fcc() == idString() )
+-      // drafts or sent of the identity
++    } else if ( identity.drafts() == idString() ||
++                identity.templates() == idString() ||
++                identity.fcc() == idString() )
++      // drafts, templates or sent of the identity
+       mWhoField = "To";
+     else
+       mWhoField = "From";

Added: trunk/packages/kdepim/debian/patches/04_kmail-140660.patch
===================================================================
--- trunk/packages/kdepim/debian/patches/04_kmail-140660.patch	2007-01-27 19:00:30 UTC (rev 5444)
+++ trunk/packages/kdepim/debian/patches/04_kmail-140660.patch	2007-01-27 19:17:49 UTC (rev 5445)
@@ -0,0 +1,19 @@
+Index: kdepim/kmail/kmfolder.cpp
+===================================================================
+--- kdepim/kmail/kmfolder.cpp	(revision 627528)
++++ kdepim/kmail/kmfolder.cpp	(working copy)
+@@ -426,12 +426,12 @@ int KMFolder::moveMsg(QPtrList<KMMessage
+ 
+ int KMFolder::find( const KMMsgBase* msg ) const
+ {
+-  return mStorage->find( msg );
++  return mStorage ? mStorage->find( msg ) : 0;
+ }
+ 
+ int KMFolder::find( const KMMessage* msg ) const
+ {
+-  return mStorage->find( msg );
++  return mStorage ? mStorage->find( msg ) : 0;
+ }
+ 
+ int KMFolder::count( bool cache ) const