revamped so that it uses the output stream of the data wrapper

2000-02-17  bertrand  <Bertrand.Guiheneuf@aful.org>

	* camel/camel-formatter.c (handle_text_plain):
	revamped so that it uses the output stream
	of the data wrapper
	(handle_text_html): ditto.


	* camel/camel-simple-data-wrapper.h:
	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_new):
	use (void) instead of ().
	(_get_output_stream): simple implementation.

A lot of small fixes so that the new parser scheme
works properly. Simple implementation of the stream
though.

Changed vette-formatter files so that they work with the
new scheme.

The new parser is now in a usable state. Still needs some work but the
infrastructure is here. /me is happy.

svn path=/trunk/; revision=1822

1 files changed, 8 insertions, 4 deletions

diff --git a/camel/camel-formatter.h b/camel/camel-formatter.h
index 186ce6b1e2..95c974f01c 100644
--- a/camel/camel-formatter.h
+++ b/camel/camel-formatter.h
@@ -1,3 +1,6 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+
 /*--------------------------------*-C-*---------------------------------*
  *
  * Author :
@@ -19,7 +22,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  *
- *
  *----------------------------------------------------------------------*/
 
 #ifndef CAMEL_FORMATTER_H
@@ -36,7 +38,7 @@ extern "C" {
 #define CAMEL_FORMATTER_TYPE     (camel_formatter_get_type ())
 #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))
+#define CAMEL_IS_FORMATTER(o)    (GTK_CHECK_TYPE((o), CAMEL_FORMATTER_TYPE))
 
 typedef struct _CamelFormatterPrivate CamelFormatterPrivate;
 
@@ -59,13 +61,15 @@ GtkType  camel_formatter_get_type (void);
 /* Public functions */
 CamelFormatter* camel_formatter_new (void);
 
-/* The main job of CamelFormatter is to take a mime message, and
-   produce html from it. */
 void camel_formatter_mime_message_to_html (CamelFormatter* formatter,
 					   CamelMimeMessage* mime_message,
 					   CamelStream* header_stream,
 					   CamelStream* body_stream);
 
+void camel_formatter_wrapper_to_html (CamelFormatter* formatter,
+				      CamelDataWrapper* data_wrapper,
+				      CamelStream* header_stream);
+
 
 #ifdef __cplusplus
 }