+ * tests/ui-tests/message-browser.c (handle_tree_item): Expand tree

+	items.
+	(mime_message_to_html): New function; translates a
+	CamelMimeMessage into two strings (one for the header, and one for
+	the body).
+	(get_gtk_html_window): New function; fills out a window with
+	html. The html is taken from a processed rfc822 file, via a
+	CamelFormatter.
+
+	* camel/camel-formatter.c: Added assertions.
+	(handle_text_html): Don't call text_to_html on something that's
+	already html.
+	(multipart_foreach): function deleted.
+
+	* mail/html-stream.c (html_stream_new): Second param of
+       gtk_html_begin should be "", not NULL.
+	(html_stream_new): gtk_html_parse() is deprecated, so the call was
+	removed.

svn path=/trunk/; revision=1766

2 files changed, 6 insertions, 2 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 18f37266c1..40ba1fca0d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,10 @@
 2000-02-13  Matt Loper  <matt@helixcode.com>
 
+	* html-stream.c (html_stream_new): Second param of gtk_html_begin
+	should be "", not NULL.
+	(html_stream_new): gtk_html_parse() is deprecated, so the call was
+	removed.
+
 	* html-stream.h: HTMLStreamClass's parent changed to
 	CamelStreamClass, not CamelStream.
 
diff --git a/mail/html-stream.c b/mail/html-stream.c
index 927f8f3593..d3028dcdcd 100644
--- a/mail/html-stream.c
+++ b/mail/html-stream.c
@@ -103,8 +103,7 @@ html_stream_new (GtkHTML *html)
 
 	gtk_object_ref (GTK_OBJECT (html));
 
-	html_stream->gtk_html_stream = gtk_html_begin (html, NULL);
-	gtk_html_parse (html);
+	html_stream->gtk_html_stream = gtk_html_begin (html, "");
 	
 	html_stream->gtk_html = html;