From d91a0645f9f595cbfa953187c366dc569f5e8e41 Mon Sep 17 00:00:00 2001 From: 1 Date: Thu, 11 May 2000 17:05:04 +0000 Subject: Free summary items and charset filters. 2000-05-11 * camel-folder-summary.c (camel_folder_summary_finalise): Free summary items and charset filters. 2000-05-10 * camel-folder-summary.c (camel_folder_summary_finalise): Don't free stuff in p, after we've free'd p. * providers/mbox/camel-mbox-folder.c (mbox_append_message): Unref the stream we created for appending. svn path=/trunk/; revision=2986 --- camel/providers/mbox/camel-mbox-folder.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'camel/providers') diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c index c38951a74d..05d00c608e 100644 --- a/camel/providers/mbox/camel-mbox-folder.c +++ b/camel/providers/mbox/camel-mbox-folder.c @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */ /* camel-mbox-folder.c : Abstract class for an email folder */ /* @@ -744,15 +744,17 @@ mbox_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelExcept filter_stream = (CamelStream *)camel_stream_filter_new_with_stream(output_stream); filter_from = (CamelMimeFilter *)camel_mime_filter_from_new(); camel_stream_filter_add((CamelStreamFilter *)filter_stream, filter_from); - camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), - filter_stream, ex); + camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), filter_stream, ex); if (!camel_exception_is_set (ex)) camel_stream_flush (filter_stream, ex); if (camel_exception_is_set (ex)) goto fail; + /* filter stream ref's the output stream itself, so we need to unref it too */ + gtk_object_unref (GTK_OBJECT (filter_from)); gtk_object_unref (GTK_OBJECT (filter_stream)); + gtk_object_unref (GTK_OBJECT (output_stream)); /* force a summary update - will only update from the new position, if it can */ camel_mbox_summary_update(mbox_folder->summary, seek); @@ -771,7 +773,8 @@ fail: if (filter_stream) { /*camel_stream_close (filter_stream);*/ gtk_object_unref ((GtkObject *)filter_stream); - } else if (output_stream) + } + if (output_stream) gtk_object_unref ((GtkObject *)output_stream); /* make sure the file isn't munged by us */ -- cgit v1.2.3