aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Sukharev <nick@galaktika.ru>2006-09-30 01:56:45 +0800
committerAndre Klapper <aklapper@src.gnome.org>2006-09-30 01:56:45 +0800
commit3a49f0f1e4e4a89ef6c5ad42090fe89d37c319ad (patch)
treead130e005a9f53c6f356cdd2dd66ed6a4705e2d5
parenta9d678a9d5470bdd12089df0a59d3b309ea57cd8 (diff)
downloadgsoc2013-evolution-3a49f0f1e4e4a89ef6c5ad42090fe89d37c319ad.tar.gz
gsoc2013-evolution-3a49f0f1e4e4a89ef6c5ad42090fe89d37c319ad.tar.zst
gsoc2013-evolution-3a49f0f1e4e4a89ef6c5ad42090fe89d37c319ad.zip
UUEncoded calendars will be displayed as calendars, not as plain text.
2006-09-29 Nick Sukharev <nick@galaktika.ru> * mail/em-format-html.c: UUEncoded calendars will be displayed as calendars, not as plain text. Fixes bug #352767. (committed by Andre Klapper) svn path=/trunk/; revision=32832
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/em-format-html.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f927ea1863..6ed6ab35c7 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-29 Nick Sukharev <nick@galaktika.ru>
+
+ * mail/em-format-html.c: UUEncoded calendars will be displayed as
+ calendars, not as plain text. Fixes bug #352767.
+ (committed by Andre Klapper)
+
2006-09-29 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #341932 Patch from Roozbeh Pournader
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 07050b31e5..8c0cb16e97 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -762,7 +762,7 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo
CamelMimePart *newpart = camel_multipart_get_part(mp, i);
type = camel_mime_part_get_content_type(newpart);
- if (camel_content_type_is (type, "text", "*")) {
+ if (camel_content_type_is (type, "text", "*") && !camel_content_type_is(type, "text", "calendar")) {
camel_stream_printf (stream,
"<div style=\"border: solid #%06x 1px; background-color: #%06x; padding: 10px;\">\n",
efh->frame_colour & 0xffffff, efh->content_colour & 0xffffff);