[evolution] Bug 765090 - Replying to a message with a reply to an inline patch loses parts at the end of the pat

[Tomas Popela <tpopela src gnome org>]

commit 46e8d74d837eaea84f6ec57bedd853a6041757e7
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Apr 15 14:33:35 2016 +0200

    Bug 765090 - Replying to a message with a reply to an inline patch loses parts at the end of the patch.
    
    We need to strip the signature from the message before we remove the quote
    characters "> " from it and put the quoted text inside a BLOCKQUOTE element.
    Before this change the text after "-- \n" sequence could be removed as there was
    no quote character on the beginning of the line.

 em-format/e-mail-formatter-quote-text-plain.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/em-format/e-mail-formatter-quote-text-plain.c b/em-format/e-mail-formatter-quote-text-plain.c
index ce97e86..0b13f5e 100644
--- a/em-format/e-mail-formatter-quote-text-plain.c
+++ b/em-format/e-mail-formatter-quote-text-plain.c
@@ -87,6 +87,14 @@ emqfe_text_plain_format (EMailFormatterExtension *extension,
 
        filtered_stream = g_object_ref (stream);
 
+       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);
+
        if ((qf_context->qf_flags & E_MAIL_FORMATTER_QUOTE_FLAG_KEEP_SIG) == 0) {
                filter = e_mail_stripsig_filter_new (TRUE);
                temp_stream = camel_filter_output_stream_new (
@@ -98,14 +106,6 @@ emqfe_text_plain_format (EMailFormatterExtension *extension,
                g_object_unref (filter);
        }
 
-       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);
-
        e_mail_formatter_format_text (
                formatter, part, filtered_stream, cancellable);