r1766 - in /unstable/evolution/debian: changelog patches/05_fix-inline-gpg.patch patches/series

[corsac at users.alioth.debian.org]

Author: corsac
Date: Tue Oct 12 07:47:53 2010
New Revision: 1766

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1766
Log:
* debian/patches:
  - 05_fix-inline-gpg added, fix inline GPG not always recognized, backport
    patch from 2.32 branch. (GNOME #630295, git 36abdbd).     closes: #599403

Added:
    unstable/evolution/debian/patches/05_fix-inline-gpg.patch
Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/patches/series

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1766&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Tue Oct 12 07:47:53 2010
@@ -2,8 +2,11 @@
 
   * Update debconf script to ask about aborting the upgrade or proceeding by
     killing processes.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 12 Oct 2010 00:27:21 +0200
+  * debian/patches:
+    - 05_fix-inline-gpg added, fix inline GPG not always recognized, backport
+      patch from 2.32 branch. (GNOME #630295, git 36abdbd).     closes: #599403
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 12 Oct 2010 09:21:39 +0200
 
 evolution (2.30.3-2) unstable; urgency=low
 

Added: unstable/evolution/debian/patches/05_fix-inline-gpg.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/05_fix-inline-gpg.patch?rev=1766&op=file
==============================================================================
--- unstable/evolution/debian/patches/05_fix-inline-gpg.patch (added)
+++ unstable/evolution/debian/patches/05_fix-inline-gpg.patch Tue Oct 12 07:47:53 2010
@@ -1,0 +1,27 @@
+diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
+index 4d3ac94..ebf9f86 100644
+--- a/mail/em-inline-filter.c
++++ b/mail/em-inline-filter.c
+@@ -213,7 +213,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
+ 	EMInlineFilter *emif = (EMInlineFilter *)f;
+ 	gchar *inptr = in, *inend = in+len;
+ 	gchar *data_start = in;
+-	gchar *start;
++	gchar *start = in;
+ 
+ 	while (inptr < inend) {
+ 		gint rest_len;
+@@ -354,8 +354,12 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
+ 		emif->state = EMIF_PLAIN;
+ 
+ 		emif_add_part(emif, data_start, inend-data_start);
++	} else if (start > data_start) {
++		/* backup the last line, in case the tag is divided within buffers */
++		camel_mime_filter_backup (f, start, inend - start);
++		g_byte_array_append (emif->data, (guchar *)data_start, start - data_start);
+ 	} else {
+-		g_byte_array_append(emif->data, (guchar *)data_start, inend-data_start);
++		g_byte_array_append (emif->data, (guchar *)data_start, inend - data_start);
+ 	}
+ 
+ 	return 0;

Modified: unstable/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/series?rev=1766&op=diff
==============================================================================
--- unstable/evolution/debian/patches/series (original)
+++ unstable/evolution/debian/patches/series Tue Oct 12 07:47:53 2010
@@ -1,3 +1,4 @@
 02_let-nss-search-for-nssckbi.patch
 03_correctly-init-nss.patch
 04_login-to-nss-on-demand.patch
+05_fix-inline-gpg.patch