Don't close base stream when destroying a CamelFilterOutputStream.

GFilterOutputStream, from which CamelFilterOutputStream is derived,
defaults to closing its base stream when the instance is finalized.

That makes sense in the general case, but CamelFilterOutputStreams are
usually temporary wrappers on a more permanent base stream, so we need
to remember to override the default "close-base-stream" property value.

I was tempted to just make CamelFilterOutputStream override the default
automatically, but I decided against it because my long term plan is to
drop CamelFilterOutputStream for GConverterOutputStream which also does
not override the "close-base-stream" default.  The closer the semantics
of the two classes match, the easier porting will be in the future.

1 files changed, 4 insertions, 0 deletions

diff --git a/em-format/e-mail-formatter-quote-text-plain.c b/em-format/e-mail-formatter-quote-text-plain.c
index d53cc53ca8..318762c125 100644
--- a/em-format/e-mail-formatter-quote-text-plain.c
+++ b/em-format/e-mail-formatter-quote-text-plain.c
@@ -89,6 +89,8 @@ emqfe_text_plain_format (EMailFormatterExtension *extension,
 		filter = e_mail_stripsig_filter_new (TRUE);
 		temp_stream = camel_filter_output_stream_new (
 			filtered_stream, filter);
+		g_filter_output_stream_set_close_base_stream (
+			G_FILTER_OUTPUT_STREAM (temp_stream), FALSE);
 		g_object_unref (filtered_stream);
 		filtered_stream = temp_stream;
 		g_object_unref (filter);
@@ -96,6 +98,8 @@ emqfe_text_plain_format (EMailFormatterExtension *extension,
 
 	filter = camel_mime_filter_tohtml_new (text_flags, rgb);
 	temp_stream = camel_filter_output_stream_new (filtered_stream, filter);
+	g_filter_output_stream_set_close_base_stream (
+		G_FILTER_OUTPUT_STREAM (temp_stream), FALSE);
 	g_object_unref (filtered_stream);
 	filtered_stream = temp_stream;
 	g_object_unref (filter);