> searchpart = strchr(namepart, '?');

2000-05-19  NotZed  <NotZed@HelixCode.com>

        * camel-simple-data-wrapper.c (construct_from_stream): If we
        already have been constructed, unref our content.
        (write_to_stream): Check we've been constructued, and change for
        stream api changes.

        * camel-mime-parser.c: Removed exception stuff.

        * md5-utils.c (md5_get_digest_from_stream): repaired.

        * camel-mime-message.c: Remove exception from write_to_stream, and
        fix, and fix formatting.

        * providers/sendmail/camel-sendmail-transport.c (_send_internal):
        Fix for stream changes.

        * providers/pop3/camel-pop3-store.c (camel_pop3_command): Fixes
        for stream changes.

        * providers/mbox/camel-mbox-folder.c, and elsewhere, fix all
        stream api changes.
        (mbox_append_message): Use stream_close() now its back.
        (mbox_append_message): unref the from filter.

        * camel-stream-mem.c: And here.

        * camel-stream-fs.[ch]: Here too.

        * camel-stream-filter.c: Likewise.  This is getting tedious.

        * camel-stream-buffer.c (stream_write): Fix a few little problems.
        (stream_close): Reimplmeent.
        (camel_stream_buffer_read_line): Slightly more efficient version,
        that also only allocates the right amount of memory for strings.

        * camel-seekable-substream.c: Likewise.

        * camel-seekable-stream.[ch]: Remove exceptions, fix formatting,
        changes for stream (re)fixes.  set_bounds returns an error.

        * camel-stream.[ch]: Remove exceptions.  Make flush and reset return
        an error code, repair all the screwed up formatting, and put back
        close.

        * camel-mime-part-utils.c
        (camel_mime_part_construct_content_from_parser): And here.

        * camel-mime-part.c (camel_mime_part_set_content): And this too.
        (write_to_stream): Fixed for stream changes.

        * camel.h: Fixed.

        * providers/vee/camel-vee-folder.c (vee_search_by_expression):
        Implement.  Performs an intersection of the two searches.
        (camel_vee_folder_finalise): Unref search folders.
        (vee_append_message): Implement append.

svn path=/trunk/; revision=3142

1 files changed, 11 insertions, 7 deletions

diff --git a/camel/camel-simple-data-wrapper.c b/camel/camel-simple-data-wrapper.c
index cc6bbc6771..f091211e3c 100644
--- a/camel/camel-simple-data-wrapper.c
+++ b/camel/camel-simple-data-wrapper.c
@@ -37,7 +37,7 @@ static CamelDataWrapperClass *parent_class = NULL;
 
 static int construct_from_stream (CamelDataWrapper *, CamelStream *);
 static int write_to_stream (CamelDataWrapper *data_wrapper,
-			    CamelStream *stream, CamelException *ex);
+			    CamelStream *stream);
 
 static void finalize (GtkObject *object);
 
@@ -116,6 +116,9 @@ construct_from_stream (CamelDataWrapper *wrapper, CamelStream *stream)
 	CamelSimpleDataWrapper *simple_data_wrapper =
 		CAMEL_SIMPLE_DATA_WRAPPER (wrapper);
 
+	if (simple_data_wrapper->content)
+		gtk_object_unref((GtkObject *)simple_data_wrapper->content);
+
 	simple_data_wrapper->content = stream;
 	gtk_object_ref (GTK_OBJECT (stream));
 	return 0;
@@ -123,15 +126,16 @@ construct_from_stream (CamelDataWrapper *wrapper, CamelStream *stream)
 
 
 static int
-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream,
-		 CamelException *ex)
+write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 {
 	CamelSimpleDataWrapper *simple_data_wrapper =
 		CAMEL_SIMPLE_DATA_WRAPPER (data_wrapper);
 
-	camel_stream_reset (simple_data_wrapper->content, ex);
-	if (camel_exception_is_set (ex))
+	if (simple_data_wrapper->content == NULL)
 		return -1;
-	return camel_stream_write_to_stream (simple_data_wrapper->content,
-					     stream, ex);
+
+	if (camel_stream_reset (simple_data_wrapper->content) == -1)
+		return -1;
+
+	return camel_stream_write_to_stream (simple_data_wrapper->content, stream);
 }