aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucian Langa <lucilanga@gnome.org>2008-05-31 01:57:40 +0800
committerLucian Langa <lucilanga@src.gnome.org>2008-05-31 01:57:40 +0800
commit9025a500103a3781b39a6b25a63387bcb42049fe (patch)
treeeff24a76e5e7dfadbe5faecc1063acfdf4b81429
parent66c4549eb809900021bd738be78775f00c35a3f1 (diff)
downloadgsoc2013-evolution-9025a500103a3781b39a6b25a63387bcb42049fe.tar.gz
gsoc2013-evolution-9025a500103a3781b39a6b25a63387bcb42049fe.tar.zst
gsoc2013-evolution-9025a500103a3781b39a6b25a63387bcb42049fe.zip
** Fix for bug #535670
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. svn path=/trunk/; revision=35559
-rw-r--r--mail/ChangeLog10
-rw-r--r--mail/em-format-quote.c1
-rw-r--r--mail/em-format.c1
3 files changed, 12 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 2f1f3b0223..29a8ab27c4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,13 @@
+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.
+
2008-05-26 Milan Crha <mcrha@redhat.com>
** Fix for bug #317755
diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c
index 059c2c98dc..6493635b87 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -554,6 +554,7 @@ static EMFormatHandler type_builtin_table[] = {
{ "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 },
};
diff --git a/mail/em-format.c b/mail/em-format.c
index ddf8693790..6f2a2125d2 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -957,6 +957,7 @@ int em_format_is_attachment(EMFormat *emf, CamelMimePart *part)
|| 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));
}