From a8feedf3901a6db06e810f0dfd6ef370b23a2718 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 3 Apr 2010 16:55:23 -0400 Subject: Adapt to Camel API changes. --- em-format/em-format-quote.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'em-format/em-format-quote.c') diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c index c297b48efa..93cb5c3b74 100644 --- a/em-format/em-format-quote.c +++ b/em-format/em-format-quote.c @@ -434,14 +434,15 @@ emfq_format_message(EMFormat *emf, CamelStream *stream, CamelMimePart *part, con static void emfq_format_source(EMFormat *emf, CamelStream *stream, CamelMimePart *part) { - CamelStreamFilter *filtered_stream; + CamelStream *filtered_stream; CamelMimeFilter *html_filter; - filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream); + filtered_stream = camel_stream_filter_new ((CamelStream *) stream); html_filter = camel_mime_filter_tohtml_new (CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES | CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT, 0); - camel_stream_filter_add(filtered_stream, html_filter); + camel_stream_filter_add ( + CAMEL_STREAM_FILTER (filtered_stream), html_filter); camel_object_unref(html_filter); em_format_format_text(emf, (CamelStream *)filtered_stream, (CamelDataWrapper *)part); @@ -473,7 +474,7 @@ emfq_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part, static void emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info) { - CamelStreamFilter *filtered_stream; + CamelStream *filtered_stream; CamelMimeFilter *html_filter; CamelMimeFilter *sig_strip; CamelContentType *type; @@ -492,16 +493,18 @@ emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, E && !g_ascii_strcasecmp(format, "flowed")) flags |= CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED; - filtered_stream = camel_stream_filter_new_with_stream(stream); + filtered_stream = camel_stream_filter_new (stream); if ((emfq->flags & EM_FORMAT_QUOTE_KEEP_SIG) == 0) { sig_strip = em_stripsig_filter_new (); - camel_stream_filter_add (filtered_stream, sig_strip); + camel_stream_filter_add ( + CAMEL_STREAM_FILTER (filtered_stream), sig_strip); camel_object_unref (sig_strip); } html_filter = camel_mime_filter_tohtml_new(flags, rgb); - camel_stream_filter_add(filtered_stream, html_filter); + camel_stream_filter_add ( + CAMEL_STREAM_FILTER (filtered_stream), html_filter); camel_object_unref(html_filter); em_format_format_text((EMFormat *)emfq, (CamelStream *)filtered_stream, (CamelDataWrapper *)part); @@ -512,7 +515,7 @@ emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, E static void emfq_text_enriched(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info) { - CamelStreamFilter *filtered_stream; + CamelStream *filtered_stream; CamelMimeFilter *enriched; guint32 flags = 0; @@ -524,8 +527,9 @@ emfq_text_enriched(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part } enriched = camel_mime_filter_enriched_new(flags); - filtered_stream = camel_stream_filter_new_with_stream (stream); - camel_stream_filter_add(filtered_stream, enriched); + filtered_stream = camel_stream_filter_new (stream); + camel_stream_filter_add ( + CAMEL_STREAM_FILTER (filtered_stream), enriched); camel_object_unref(enriched); camel_stream_write_string(stream, "

"); -- cgit v1.2.3