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, 22 insertions, 5 deletions

diff --git a/camel/camel-simple-data-wrapper.c b/camel/camel-simple-data-wrapper.c
index 943d8e902d..f4b7afd5f9 100644
--- a/camel/camel-simple-data-wrapper.c
+++ b/camel/camel-simple-data-wrapper.c
@@ -35,10 +35,15 @@ static  CamelDataWrapperClass *parent_class=NULL;
 /* Returns the class for a CamelDataWrapper */
 #define CSDW_CLASS(so) CAMEL_SIMPLE_DATA_WRAPPER_CLASS (GTK_OBJECT(so)->klass)
 
-static void _construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
-static void _write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
-static void _finalize (GtkObject *object);
-static CamelStream *_get_stream (CamelDataWrapper *data_wrapper);
+static void            _construct_from_stream     (CamelDataWrapper *data_wrapper, 
+						   CamelStream *stream);
+static void            _write_to_stream           (CamelDataWrapper *data_wrapper, 
+						   CamelStream *stream);
+static void            _finalize                  (GtkObject *object);
+static CamelStream *   _get_stream                (CamelDataWrapper *data_wrapper);
+static CamelStream *   _get_output_stream         (CamelDataWrapper *data_wrapper);
+
+
 
 static void
 camel_simple_data_wrapper_class_init (CamelSimpleDataWrapperClass *camel_simple_data_wrapper_class)
@@ -52,6 +57,7 @@ camel_simple_data_wrapper_class_init (CamelSimpleDataWrapperClass *camel_simple_
 	/* virtual method overload */
 	camel_data_wrapper_class->write_to_stream = _write_to_stream;
 	camel_data_wrapper_class->construct_from_stream = _construct_from_stream;
+	camel_data_wrapper_class->get_output_stream = _get_output_stream;
 
 	camel_data_wrapper_class->get_stream = _get_stream;
 
@@ -111,7 +117,7 @@ _finalize (GtkObject *object)
  * Return value: 
  **/
 CamelSimpleDataWrapper *
-camel_simple_data_wrapper_new ()
+camel_simple_data_wrapper_new (void)
 {
 	CamelSimpleDataWrapper *simple_data_wrapper;
 	CAMEL_LOG_FULL_DEBUG ("CamelSimpleDataWrapper:: Entering new()\n");
@@ -228,3 +234,14 @@ _get_stream (CamelDataWrapper *data_wrapper)
 
 	return simple_data_wrapper->stream;
 }
+
+
+static CamelStream *
+_get_output_stream (CamelDataWrapper *data_wrapper)
+{
+	
+	CAMEL_LOG_FULL_DEBUG ("CamelSimpleDataWrapper::get_output_stream leaving\n");
+	return camel_data_wrapper_get_input_stream (data_wrapper);
+	CAMEL_LOG_FULL_DEBUG ("CamelSimpleDataWrapper::get_output_stream leaving\n");
+
+}