diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-10-01 03:36:49 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-10-01 03:51:10 +0800 |
commit | bb0ac533c471c5de15312e5d201b6f61fcfe4f09 (patch) | |
tree | 024938720b87a8a4eef777bf037b978ee952ff82 | |
parent | 1964f9294b204441e8d8216d720cc97ad39d3f7b (diff) | |
download | gsoc2013-evolution-bb0ac533c471c5de15312e5d201b6f61fcfe4f09.tar gsoc2013-evolution-bb0ac533c471c5de15312e5d201b6f61fcfe4f09.tar.gz gsoc2013-evolution-bb0ac533c471c5de15312e5d201b6f61fcfe4f09.tar.bz2 gsoc2013-evolution-bb0ac533c471c5de15312e5d201b6f61fcfe4f09.tar.lz gsoc2013-evolution-bb0ac533c471c5de15312e5d201b6f61fcfe4f09.tar.xz gsoc2013-evolution-bb0ac533c471c5de15312e5d201b6f61fcfe4f09.tar.zst gsoc2013-evolution-bb0ac533c471c5de15312e5d201b6f61fcfe4f09.zip |
Bug 708390 - text-highlight: Don't interfere with printing
The text-highlight module is for enhancing the *display* of textual
email parts. It should not interfere at all when printing an email.
(cherry picked from commit 169ec754ae991e0bd3975ee89e6110f1a0a8d841)
-rw-r--r-- | modules/text-highlight/e-mail-formatter-text-highlight.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/modules/text-highlight/e-mail-formatter-text-highlight.c b/modules/text-highlight/e-mail-formatter-text-highlight.c index b387408573..ce61d88ed3 100644 --- a/modules/text-highlight/e-mail-formatter-text-highlight.c +++ b/modules/text-highlight/e-mail-formatter-text-highlight.c @@ -139,33 +139,8 @@ emfe_text_highlight_format (EMailFormatterExtension *extension, } if (context->mode == E_MAIL_FORMATTER_MODE_PRINTING) { - CamelDataWrapper *dw; - CamelStream *filter_stream; - CamelMimeFilter *mime_filter; - - dw = camel_medium_get_content (CAMEL_MEDIUM (mime_part)); - if (dw == NULL) - goto exit; - - camel_stream_write_string ( - stream, "<pre><div class=\"pre\">", cancellable, NULL); - - filter_stream = camel_stream_filter_new (stream); - mime_filter = camel_mime_filter_tohtml_new ( - CAMEL_MIME_FILTER_TOHTML_PRE | - CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES, 0); - camel_stream_filter_add ( - CAMEL_STREAM_FILTER (filter_stream), mime_filter); - g_object_unref (mime_filter); - - e_mail_formatter_format_text ( - formatter, part, filter_stream, cancellable); - - camel_stream_flush (filter_stream, cancellable, NULL); - g_object_unref (filter_stream); - - camel_stream_write_string ( - stream, "</div></pre>", cancellable, NULL); + /* Don't interfere with printing. */ + goto exit; } else if (context->mode == E_MAIL_FORMATTER_MODE_RAW) { gint pipe_stdin, pipe_stdout; |