From 27264ef758d4f7c95f17ff30f056ab7cacb0c0f6 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Wed, 30 Jul 2008 10:35:20 +0000 Subject: [PATCH] * Fixes NB#87102, append the signature at the end of the message pmo-trunk-r5213 --- src/modest-text-utils.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c index 6ef698a..e2802d8 100644 --- a/src/modest-text-utils.c +++ b/src/modest-text-utils.c @@ -870,10 +870,6 @@ modest_text_utils_quote_plain_text (const gchar *text, gchar *attachments_string = NULL; q = g_string_new ("\n"); - if (signature != NULL) { - q = g_string_append (q, signature); - q = g_string_append_c (q, '\n'); - } q = g_string_append (q, cite); q = g_string_append_c (q, '\n'); @@ -924,6 +920,12 @@ modest_text_utils_quote_plain_text (const gchar *text, q = g_string_append (q, attachments_string); g_free (attachments_string); + if (signature != NULL) { + q = g_string_append (q, "\n--\n"); + q = g_string_append (q, signature); + q = g_string_append_c (q, '\n'); + } + return g_string_free (q, FALSE); } @@ -940,8 +942,8 @@ modest_text_utils_quote_html (const gchar *text, "\n" \ "\n" \ "\n" \ - "
%s
" \ "

%s
%s
%s

\n" \ + "
--
%s
\n" \ "\n" \ "\n"; gchar *attachments_string = NULL; @@ -958,7 +960,7 @@ modest_text_utils_quote_html (const gchar *text, q_attachments_string = modest_text_utils_convert_to_html_body (attachments_string, -1, TRUE); q_cite = modest_text_utils_convert_to_html_body (cite, -1, TRUE); html_text = modest_text_utils_convert_to_html_body (text, -1, TRUE); - result = g_strdup_printf (format, signature_result, q_cite, html_text, q_attachments_string); + result = g_strdup_printf (format, q_cite, html_text, q_attachments_string, signature_result); g_free (q_cite); g_free (html_text); g_free (attachments_string); -- 1.7.9.5