evolution r35559 - trunk/mail

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri May 30 17:57:40 2008
New Revision: 35559
URL: http://svn.gnome.org/viewvc/evolution?rev=35559&view=rev

Log:
2008-05-30  Lucian Langa  <lucilanga gnome org>

** Fix for bug #535670

* em-format-quote.c: (type_builtin_table):
Add x-evolution/evolution-feed-rss as internal mime
for evolution-rss artiles.
* em-format.c: (em_format_is_attachment): prevent
evolution-rss articles being formatted as attachments.

Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-format-quote.c
   trunk/mail/em-format.c

Modified: trunk/mail/em-format-quote.c
==============================================================================
--- trunk/mail/em-format-quote.c	(original)
+++ trunk/mail/em-format-quote.c	Fri May 30 17:57:40 2008
@@ -554,6 +554,7 @@
 	{ "multipart/appledouble", (EMFormatFunc)emfq_ignore },
 
 	/* internal evolution types */
+	{ "x-evolution/evolution-rss-feed", (EMFormatFunc)emfq_text_html },
 	{ "x-evolution/message/rfc822", (EMFormatFunc)emfq_format_message },
 	{ "x-evolution/message/prefix", (EMFormatFunc)emfq_format_message_prefix },
 };

Modified: trunk/mail/em-format.c
==============================================================================
--- trunk/mail/em-format.c	(original)
+++ trunk/mail/em-format.c	Fri May 30 17:57:40 2008
@@ -957,6 +957,7 @@
 		 || camel_content_type_is(dw->mime_type, "application", "pkcs7-mime")
 		 || camel_content_type_is(dw->mime_type, "application", "x-inlinepgp-signed")
 		 || camel_content_type_is(dw->mime_type, "application", "x-inlinepgp-encrypted")
+		 || camel_content_type_is(dw->mime_type, "x-evolution", "evolution-rss-feed")
 		 || (camel_content_type_is (dw->mime_type, "text", "*")
 		     && camel_mime_part_get_filename(part) == NULL));
 }