aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2002-02-07 03:52:08 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-02-07 03:52:08 +0800
commit411fd545df9ba41609b00e67e96369f493fe0610 (patch)
tree73eb88223852a43d2a1c5bde678781a379e3108e
parent33f7597222b0b4654492a68373ff23fd07c7aa28 (diff)
downloadgsoc2013-evolution-411fd545df9ba41609b00e67e96369f493fe0610.tar.gz
gsoc2013-evolution-411fd545df9ba41609b00e67e96369f493fe0610.tar.zst
gsoc2013-evolution-411fd545df9ba41609b00e67e96369f493fe0610.zip
Look for DOCTYPE XML comments too to decide if the message content is
2002-02-06 Jeffrey Stedfast <fejj@ximian.com> * mail-format.c (handle_text_plain): Look for DOCTYPE XML comments too to decide if the message content is really HTML. svn path=/trunk/; revision=15581
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-format.c2
-rw-r--r--mail/message-list.etspec2
3 files changed, 7 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 40c6689f0c..b9380b90dc 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-06 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-format.c (handle_text_plain): Look for DOCTYPE XML comments
+ too to decide if the message content is really HTML.
+
2002-02-06 Not Zed <NotZed@Ximian.com>
* mail-callbacks.c (mail_generate_reply): Dont double-free the
diff --git a/mail/mail-format.c b/mail/mail-format.c
index ff0bfd2c63..a55ffbbe17 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1195,7 +1195,7 @@ handle_text_plain (CamelMimePart *part, const char *mime_type,
start = text;
while (isspace ((unsigned) *start))
start++;
- if (!g_strncasecmp (start, "<html>", 6)) {
+ if (!g_strncasecmp (start, "<html>", 6) || !g_strncasecmp (start, "<!DOCTYPE HTML", 14)) {
g_free (text);
return handle_text_html (part, "text/html", md, html, stream);
}
diff --git a/mail/message-list.etspec b/mail/message-list.etspec
index 9733eae9d6..ef79da817a 100644
--- a/mail/message-list.etspec
+++ b/mail/message-list.etspec
@@ -12,7 +12,7 @@
<ETableColumn model_col= "9" _title="Size" expansion="0.2" minimum_width="32" resizable="true" cell="render_size" compare="integer"/>
<ETableColumn model_col="10" _title="Needs Reply" pixbuf="needsreply" expansion="0.0" minimum_width="18" resizable="false" cell="render_needs_reply" compare="integer" sortable="false"/>
<ETableState>
- <column source="0"/> <column source="10"/> <column source="3"/> <column source="1"/>
+ <column source="0"/> <column source="3"/> <column source="1"/>
<column source="4"/> <column source="5" expansion="1.60"/> <column source="6" expansion="0.40"/>
<grouping> </grouping>
</ETableState>