aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/component-factory.c2
-rw-r--r--mail/mail-format.c9
3 files changed, 19 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7f847412ba..dd53afaba2 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-21 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-format.c (handle_text_plain): If the first "token" in the
+ body is "<html>", then treat this as a text/html part rather than
+ a text/plain part. Fixes bug #16817.
+
+ * component-factory.c (destination_folder_handle_drop): Removed
+ some unused variables.
+
2002-01-17 Jeffrey Stedfast <fejj@ximian.com>
* mail-format.c (try_uudecoding): Update to match new uudecode
diff --git a/mail/component-factory.c b/mail/component-factory.c
index e6d04129d9..3e1de3cd43 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -526,7 +526,7 @@ destination_folder_handle_drop (EvolutionShellComponentDndDestinationFolder *des
const GNOME_Evolution_ShellComponentDnd_Data *data,
gpointer user_data)
{
- char *tmp, *url, **urls, *in, *inptr, *inend;
+ char *tmp, *url, **urls;
gboolean retval = FALSE;
const char *noselect;
CamelFolder *folder;
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 28e5359345..ea200f5f30 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1191,6 +1191,15 @@ handle_text_plain (CamelMimePart *part, const char *mime_type,
text = bytes->data;
g_byte_array_free (bytes, FALSE);
+ /* Check to see if this is a broken text/html part with content-type text/plain */
+ start = text;
+ while (isspace ((unsigned) *start))
+ start++;
+ if (!g_strncasecmp (start, "<html>", 6)) {
+ g_free (text);
+ return handle_text_html (part, "text/html", md, html, stream);
+ }
+
/* Check for RFC 2646 flowed text. */
type = camel_mime_part_get_content_type (part);
format = header_content_type_param (type, "format");