From e88e358052d962c4444d36d26378f4a67cdfd5c4 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 18 Oct 2002 04:14:41 +0000 Subject: Strip the signature from the body-text. Fixes bug #5529. 2002-10-17 Jeffrey Stedfast * mail-tools.c (mail_tool_quote_message): Strip the signature from the body-text. Fixes bug #5529. svn path=/trunk/; revision=18393 --- mail/ChangeLog | 5 +++++ mail/mail-tools.c | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index d8a9f89ae9..f953169b63 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2002-10-17 Jeffrey Stedfast + + * mail-tools.c (mail_tool_quote_message): Strip the signature from + the body-text. Fixes bug #5529. + 2002-10-16 Jeffrey Stedfast * mail-format.c (handle_multipart_signed): Don't need to pass a diff --git a/mail/mail-tools.c b/mail/mail-tools.c index 217c0db3f2..6a210c2204 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -362,7 +362,15 @@ mail_tool_quote_message (CamelMimeMessage *message, const char *fmt, ...) /* Set the quoted reply text. */ if (text) { - gchar *ret_text, *credits = NULL; + char *sig, *p, *ret_text, *credits = NULL; + + /* look for the signature and strip it off */ + sig = text; + while ((p = strstr (sig, "\n-- \n"))) + sig = p + 4; + + if (sig != text) + *sig = '\0'; /* create credits */ if (fmt) { -- cgit v1.2.3