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

[Sune Vuorela]

Author: pusling-guest
Date: 2008-03-16 19:00:54 +0000 (Sun, 16 Mar 2008)
New Revision: 9793

Added:
   trunk/packages/kdepim/debian/patches/17_add_popfile_headers_to_fancy_view_if_requested.diff
Modified:
   trunk/packages/kdepim/debian/changelog
Log:
add patch to try to interact nicely with popfile spam filter. have had this patch tested locally in almsot half year, so let us let everyone get it

Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2008-03-16 18:51:58 UTC (rev 9792)
+++ trunk/packages/kdepim/debian/changelog	2008-03-16 19:00:54 UTC (rev 9793)
@@ -10,6 +10,7 @@
   
   * Add kontact plugin abi version and do nice magic around it.
   * Add a conflicts against non-working basket integration.
+  * Add a patch to show special headers for popfile spam filter in fancy view.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 15 Mar 2008 13:49:23 +0100
 

Added: trunk/packages/kdepim/debian/patches/17_add_popfile_headers_to_fancy_view_if_requested.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/17_add_popfile_headers_to_fancy_view_if_requested.diff	                        (rev 0)
+++ trunk/packages/kdepim/debian/patches/17_add_popfile_headers_to_fancy_view_if_requested.diff	2008-03-16 19:00:54 UTC (rev 9793)
@@ -0,0 +1,38 @@
+Index: kdepim/kmail/headerstrategy.cpp
+===================================================================
+--- kdepim/kmail/headerstrategy.cpp	(revision 701051)
++++ kdepim/kmail/headerstrategy.cpp	(working copy)
+@@ -61,7 +61,7 @@
+   static const char * richHeaders[] = {
+     "subject", "date", "from", "cc", "bcc", "to",
+     "organization", "organisation", "reply-to",
+-    "user-agent", "x-mailer"
++    "user-agent", "x-mailer", "x-text-classification", "x-popfile-link"
+   };
+   static const int numRichHeaders = sizeof richHeaders / sizeof *richHeaders;
+ 
+Index: kdepim/kmail/headerstyle.cpp
+===================================================================
+--- kdepim/kmail/headerstyle.cpp	(revision 701051)
++++ kdepim/kmail/headerstyle.cpp	(working copy)
+@@ -703,6 +703,20 @@
+         }
+       }
+     }
++    if (configReader.readBoolEntry( "showSpamStatus", true )  ) {
++      if (strategy->showHeader( "x-text-classification" ) && strategy->showHeader( "x-popfile-link" ) )
++      {
++        if ( ! message->headerField( "X-Text-Classification" ).isEmpty() && ! message->headerField( "X-POPFile-Link" ).isEmpty() )
++	{
++          headerStr.append(QString("<tr><th>%1</th>\n"
++                                   "<td>%2&nbsp;&nbsp;(<a href=\"%3\">%4</a>)</td></tr>\n")
++                           .arg("Popfile:")
++                           .arg( strToHtml( message->headerField("X-Text-Classification") ) )
++			                    .arg( message->headerField("X-POPFile-Link") )
++					    .arg(i18n("Reclassify") ) );
++	}
++      }
++    }
+ 
+     // FIXME: Show status in synthetic header style field.  Decide whether this or current in brackets style is best and remove one.
+     /*    if( strategy->showHeader( "status" ) )