From 0cd1c1934c5a366a8d506c177c859d65075fb942 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 18 May 2000 01:00:25 +0000 Subject: remove get/set_output_stream operations. They're redundant with * camel-data-wrapper.c: remove get/set_output_stream operations. They're redundant with write_to_stream, and CamelMimePart and CamelMimeMessage only implement the latter, meaning that trying to get_output_stream on a CamelMimeMessage that was built from pieces rather than being parsed from a stream doesn't work. Anything that uses get_output_stream can be rewritten to use write_to_stream, so we'll standardize on that. (camel_data_wrapper_new): remove this: CamelDataWrapper is supposed to be an abstract class. (write_to_stream): remove default implementation. (Moved to CamelSimpleDataWrapper) * camel-simple-data-wrapper.c: resurrect, although it's not really the same thing it was before. A simple data wrapper, which is backed by a CamelStream. * camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser): Use construct_from_stream rather than set_output_stream. (camel_mime_part_construct_content_from_parser): Change camel_data_wrapper_new to camel_simple_data_wrapper_new. * camel-mime-part.c (camel_mime_part_set_content): Change camel_data_wrapper_new to camel_simple_data_wrapper_new. svn path=/trunk/; revision=3112 --- camel/camel-mime-part-utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'camel/camel-mime-part-utils.c') diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c index fc11665623..e361335392 100644 --- a/camel/camel-mime-part-utils.c +++ b/camel/camel-mime-part-utils.c @@ -125,7 +125,7 @@ simple_data_wrapper_construct_from_parser(CamelDataWrapper *dw, CamelMimeParser CamelStream *mem; d(printf("Small message part, kept in memory!\n")); mem = camel_stream_mem_new_with_byte_array(buffer); - camel_data_wrapper_set_output_stream (dw, mem); + camel_data_wrapper_construct_from_stream (dw, mem); gtk_object_unref ((GtkObject *)mem); } else { CamelStream *sub; @@ -145,10 +145,10 @@ simple_data_wrapper_construct_from_parser(CamelDataWrapper *dw, CamelMimeParser camel_mime_filter_reset(fch); camel_stream_filter_add(filter, fch); } - camel_data_wrapper_set_output_stream (dw, (CamelStream *)filter); + camel_data_wrapper_construct_from_stream (dw, (CamelStream *)filter); gtk_object_unref ((GtkObject *)filter); } else { - camel_data_wrapper_set_output_stream (dw, sub); + camel_data_wrapper_construct_from_stream (dw, sub); } gtk_object_unref ((GtkObject *)sub); } @@ -176,7 +176,7 @@ camel_mime_part_construct_content_from_parser(CamelMimePart *dw, CamelMimeParser switch (camel_mime_parser_state(mp)) { case HSCAN_HEADER: d(printf("Creating body part\n")); - content = camel_data_wrapper_new(); + content = camel_simple_data_wrapper_new(); simple_data_wrapper_construct_from_parser(content, mp); break; case HSCAN_MESSAGE: -- cgit v1.2.3