[evolution-patches] 43887, text/enriched text/richtext reply quoting not working

[Not Zed <notzed ximian com>]

good reason it didn't work, it wasn't implemented ... :)

whats the deal with mail patch approval since Jeff is away for a few
days (assuming he doesn't abuse his leave and read mail).

Index: camel/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.1834
diff -u -3 -r1.1834 ChangeLog
--- camel/ChangeLog	20 Jun 2003 03:53:33 -0000	1.1834
+++ camel/ChangeLog	20 Jun 2003 04:49:11 -0000
@@ -1,3 +1,18 @@
+2003-06-20  Not Zed  <NotZed Ximian com>
+
+	** See bug #43887
+
+	* camel-mime-filter-enriched.c (camel_enriched_to_html): simple
+	wrapper to convert enriched to html in one go.
+
+	** See bug #44295
+
+	* providers/smtp/camel-smtp-transport.c (smtp_helo): canonicalise
+	the hostname before sending it to the world.
+
+	* camel-mime-utils.c (header_domain_decode): external api to
+	header_decode_domain, decode an rfc822 domain into canonical form.
+
 2003-06-18  Not Zed  <NotZed Ximian com>
 
 	* camel-service.c (get_hostbyaddr, get_hostbyname): if we got
Index: camel/camel-mime-filter-enriched.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/camel-mime-filter-enriched.c,v
retrieving revision 1.4
diff -u -3 -r1.4 camel-mime-filter-enriched.c
--- camel/camel-mime-filter-enriched.c	31 Mar 2003 21:54:46 -0000	1.4
+++ camel/camel-mime-filter-enriched.c	20 Jun 2003 04:49:11 -0000
@@ -570,3 +570,22 @@
 	
 	return CAMEL_MIME_FILTER (new);
 }
+
+char *
+camel_enriched_to_html(const char *in, guint32 flags)
+{
+	CamelMimeFilter *filter;
+	size_t outlen, outpre;
+	char *outbuf;
+
+	if (in == NULL)
+		return NULL;
+	
+	filter = camel_mime_filter_enriched_new(flags);
+	
+	camel_mime_filter_complete(filter, (char *)in, strlen(in), 0, &outbuf, &outlen, &outpre);
+	outbuf = g_strndup (outbuf, outlen);
+	camel_object_unref (filter);
+	
+	return outbuf;
+}
Index: camel/camel-mime-filter-enriched.h
===================================================================
RCS file: /cvs/gnome/evolution/camel/camel-mime-filter-enriched.h,v
retrieving revision 1.1
diff -u -3 -r1.1 camel-mime-filter-enriched.h
--- camel/camel-mime-filter-enriched.h	16 Dec 2002 15:05:06 -0000	1.1
+++ camel/camel-mime-filter-enriched.h	20 Jun 2003 04:49:11 -0000
@@ -58,6 +58,7 @@
 CamelType        camel_mime_filter_enriched_get_type (void);
 
 CamelMimeFilter *camel_mime_filter_enriched_new (guint32 flags);
+char *camel_enriched_to_html(const char *in, guint32 flags);
 
 #ifdef __cplusplus
 }
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2750
diff -u -3 -r1.2750 ChangeLog
--- mail/ChangeLog	17 Jun 2003 03:15:44 -0000	1.2750
+++ mail/ChangeLog	20 Jun 2003 04:49:12 -0000
@@ -1,3 +1,18 @@
+2003-06-20  Not Zed  <NotZed Ximian com>
+
+	** See bug #43887
+
+	* mail-format.c (mail_get_message_body): handle text/enriched and
+	text/richtext explictly, and dont treat them as text/plain.
+
+2003-06-19  Not Zed  <NotZed Ximian com>
+
+	** See bug #45063
+
+	* folder-browser.c (do_message_selected): dont re-load if the same
+	message gets selected again as one we've already shown.  Etree
+	sends out selection changed events even when when it hasn't.
+
 2003-06-16  Not Zed  <NotZed Ximian com>
 
 	** See bug #44609
Index: mail/mail-format.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-format.c,v
retrieving revision 1.286
diff -u -3 -r1.286 mail-format.c
--- mail/mail-format.c	12 Jun 2003 04:47:32 -0000	1.286
+++ mail/mail-format.c	20 Jun 2003 04:49:13 -0000
@@ -2007,13 +2007,18 @@
 			g_byte_array_free (bytes, FALSE);
 		}
 		
-		if (text && !header_content_type_is (mime_type, "text", "html")) {
+		if (text && !header_content_type_is(mime_type, "text", "html")) {
 			char *html;
 			
-			html = camel_text_to_html (text, CAMEL_MIME_FILTER_TOHTML_PRE |
-						   CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
-						   (cite ? CAMEL_MIME_FILTER_TOHTML_CITE : 0), 0);
-			g_free (text);
+			if (header_content_type_is(mime_type, "text", "richtext"))
+				html = camel_enriched_to_html(text, CAMEL_MIME_FILTER_ENRICHED_IS_RICHTEXT);
+			else if (header_content_type_is(mime_type, "text", "enriched"))
+				html = camel_enriched_to_html(text, 0);
+			else
+				html = camel_text_to_html (text, CAMEL_MIME_FILTER_TOHTML_PRE |
+							   CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
+							   (cite ? CAMEL_MIME_FILTER_TOHTML_CITE : 0), 0);
+			g_free(text);
 			text = html;
 		}
 		return text;