Re-implemented to use streams. Also no need to check for html since

2002-12-16  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-format.c (handle_text_plain): Re-implemented to use
	streams. Also no need to check for html since
	camel-mime-part-utils.c now does this for us and will re-tag the
	mime-type as text/html thus the UI can be completely ignorant of
	this process.
	(handle_text_plain_flowed): Removed.
	(write_one_text_plain_chunk): Removed.
	(try_uudecoding): Removed.
	(try_inline_binhex): Removed.
	(handle_text_enriched): Re-implemented to use streams too.

2002-12-15  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-format.c (write_text_header): Change the order of the args
	to be consistant with other write functions.
	(write_date): Same.
	(write_field_row_begin): Here too.
	(write_headers): Here too.
	(write_one_text_plain_chunk): Don't strdup just to pass it to
	mail_text_write() so that it can dup it yet again into html text
	and dup it yet a 3rd time into a GByteArray. Instead just write it
	to gtkhtml.
	(handle_*): Fixed arguments to take a MailDisplayStream instead of
	a GtkHTML widget and a GtkHMLStream.

	* mail-display.c (mail_display_render): Create a MailDisplayStream
	to pass to mail_format_mime_message() and
	mail_format_raw_message().

	* mail-display-stream.[c,h]: New stream to replace
	mail-stream-gtkhtml.c

	* mail-stream-gtkhtml.[c,h]: Removed.

svn path=/trunk/; revision=19126

1 files changed, 7 insertions, 6 deletions

diff --git a/mail/mail.h b/mail/mail.h
index d303bef845..627ca3526d 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -29,7 +29,7 @@
 #include "mail-callbacks.h"
 #include "mail-config.h"
 #include "mail-config-druid.h"
-/*#include "folder-browser.h"*/
+#include "mail-display-stream.h"
 #include "mail-session.h"
 #include "mail-types.h"
 
@@ -40,9 +40,10 @@ GByteArray *mail_format_get_data_wrapper_text (CamelDataWrapper *data,
 					       MailDisplay *mail_display);
 
 void mail_format_mime_message (CamelMimeMessage *mime_message,
-			       MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream);
+			       MailDisplay *md, MailDisplayStream *stream);
 void mail_format_raw_message (CamelMimeMessage *mime_message,
-			      MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream);
+			      MailDisplay *md, MailDisplayStream *stream);
+
 gboolean mail_content_loaded (CamelDataWrapper *wrapper,
 			      MailDisplay *display,
 			      gboolean redisplay,
@@ -50,15 +51,15 @@ gboolean mail_content_loaded (CamelDataWrapper *wrapper,
 			      GtkHTML *html,
 			      GtkHTMLStream *handle);
 
-typedef gboolean (*MailMimeHandlerFn) (CamelMimePart *part,
-				       const char *mime_type,
-				       MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream);
+typedef gboolean (*MailMimeHandlerFn) (CamelMimePart *part, const char *mime_type,
+				       MailDisplay *md, MailDisplayStream *stream);
 typedef struct {
 	gboolean generic;
 	Bonobo_ServerInfo *component;
 	GList *applications;
 	MailMimeHandlerFn builtin;
 } MailMimeHandler;
+
 MailMimeHandler *mail_lookup_handler (const char *mime_type);
 
 gboolean mail_part_is_inline (CamelMimePart *part);