r1771 - in /unstable/evolution/debian: changelog patches/06_fix-empty-quote-html-reply.patch patches/series

[corsac at users.alioth.debian.org]

Author: corsac
Date: Fri Oct 15 15:27:37 2010
New Revision: 1771

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1771
Log:
06_fix-empty-quote-html-reply added, fix empty quote when replying to
HTML messages. (GNOME #629046, git 19fb229).              closes: #596156

Added:
    unstable/evolution/debian/patches/06_fix-empty-quote-html-reply.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=1771&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Fri Oct 15 15:27:37 2010
@@ -5,10 +5,12 @@
   * 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
+    - 06_fix-empty-quote-html-reply added, fix empty quote when replying to
+      HTML messages. (GNOME #629046, git 19fb229).              closes: #596156
   * debian/po:
     - add da.po, thanks to Joe Hansen.                          closes: #599452
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 14 Oct 2010 20:32:49 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 15 Oct 2010 16:48:13 +0200
 
 evolution (2.30.3-2) unstable; urgency=low
 

Added: unstable/evolution/debian/patches/06_fix-empty-quote-html-reply.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/06_fix-empty-quote-html-reply.patch?rev=1771&op=file
==============================================================================
--- unstable/evolution/debian/patches/06_fix-empty-quote-html-reply.patch (added)
+++ unstable/evolution/debian/patches/06_fix-empty-quote-html-reply.patch Fri Oct 15 15:27:37 2010
@@ -1,0 +1,22 @@
+commit 19fb22903ca10a1e22e1f23a5accee350b75fee1
+Author: Milan Crha <mcrha at redhat.com>
+Date:   Thu Sep 9 09:37:44 2010 +0200
+
+    Bug #629046 - Empty reply quotation for HTML messages
+
+diff --git a/em-format/em-format.c b/em-format/em-format.c
+index 119ac64..baa1803 100644
+--- a/em-format/em-format.c
++++ b/em-format/em-format.c
+@@ -1612,8 +1612,9 @@ emf_multipart_alternative (EMFormat *emf,
+ 		/*if (want_plain && !strcmp (mime_type, "text/plain"))
+ 		  return part;*/
+ 
+-		if (em_format_find_handler(emf, mime_type)
+-		    || (best == NULL && em_format_fallback_handler(emf, mime_type))) {
++		if (!em_format_is_attachment (emf, part) &&
++		    (em_format_find_handler (emf, mime_type)
++		    || (best == NULL && em_format_fallback_handler (emf, mime_type)))) {
+ 			best = part;
+ 			bestid = i;
+ 		}

Modified: unstable/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/series?rev=1771&op=diff
==============================================================================
--- unstable/evolution/debian/patches/series (original)
+++ unstable/evolution/debian/patches/series Fri Oct 15 15:27:37 2010
@@ -2,3 +2,4 @@
 03_correctly-init-nss.patch
 04_login-to-nss-on-demand.patch
 05_fix-inline-gpg.patch
+06_fix-empty-quote-html-reply.patch