From 122a24ce8f71aba4b3e5c12581c6e66a3ad14c73 Mon Sep 17 00:00:00 2001
From: Not Zed <NotZed@Ximian.com>
Date: Tue, 23 Jul 2002 11:24:00 +0000
Subject: Applied patch below.

2002-07-23  Not Zed  <NotZed@Ximian.com>

        * Applied patch below.

2002-07-19  Christian Kreibich <christian@whoop.org>

        * e.msg-composer.c (get_signature_html): Test for the signature
        delimiter not only at the beginning of a signature file, but also
        inside the signature.

svn path=/trunk/; revision=17547
---
 composer/e-msg-composer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'composer/e-msg-composer.c')

diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 41d85a91d5..5d044725c9 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -955,7 +955,7 @@ get_signature_html (EMsgComposer *composer)
 					"%s%s%s%s"
 					"</TD></TR></TABLE>",
 					format_html ? "" : "<PRE>\n",
-					format_html || !strncmp ("-- \n", text, 4) ? "" : "-- \n",
+					format_html || (!strncmp ("-- \n", text, 4) || strstr(text, "\n-- \n")) ? "" : "-- \n",
 					text,
 					format_html ? "" : "</PRE>\n");
 		g_free (text);
-- 
cgit v1.2.3