New member to 'CamelFormatterPrivate', 'attachments', will be used to let

	* camel/camel-formatter.c: New member to 'CamelFormatterPrivate',
	'attachments', will be used to let the caller know which items
	should be treated as attachments (as opposed to objects which are
	inline to the body).
	(text_to_html): name changed from 'encode_entities'. Also now
	converts newlines to <br> tags.
	(camel_formatter_mime_message_to_html): Now takes two output
	streams -- one for the header, and one for the body.
	(get_bonobo_tag_for_object): New function; tries to make a tag out
	of (1) the leaf of a mime message and (2) a bonobo object that can
	handle its mime type, but can return NULL if it fails to find the
	mime type.
	(handle_vcard): New function; will write out a vcard as html.

svn path=/trunk/; revision=1696

1 files changed, 4 insertions, 3 deletions

diff --git a/camel/camel-formatter.h b/camel/camel-formatter.h
index 30dbc2008e..186ce6b1e2 100644
--- a/camel/camel-formatter.h
+++ b/camel/camel-formatter.h
@@ -34,8 +34,8 @@ extern "C" {
 #include "camel.h"
 
 #define CAMEL_FORMATTER_TYPE     (camel_formatter_get_type ())
-#define CAMEL_FORMATTER(obj)     (GTK_CHECK_CAST((obj), CAMEL_FORMATTER_TYPE, CamelDataWrapper))
-#define CAMEL_FORMATTER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_FORMATTER_TYPE, CamelDataWrapperClass))
+#define CAMEL_FORMATTER(obj)     (GTK_CHECK_CAST((obj), CAMEL_FORMATTER_TYPE, CamelFormatter))
+#define CAMEL_FORMATTER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_FORMATTER_TYPE, CamelFormatterClass))
 #define CAMEL_IS_CAMEL_FORMATTER(o)    (GTK_CHECK_TYPE((o), CAMEL_FORMATTER_TYPE))
 
 typedef struct _CamelFormatterPrivate CamelFormatterPrivate;
@@ -63,7 +63,8 @@ CamelFormatter* camel_formatter_new (void);
    produce html from it. */
 void camel_formatter_mime_message_to_html (CamelFormatter* formatter,
 					   CamelMimeMessage* mime_message,
-					   CamelStream* stream);
+					   CamelStream* header_stream,
+					   CamelStream* body_stream);
 
 
 #ifdef __cplusplus