From eef2191a3a4fc8bb358b04a1eb0c10ba5f34e611 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 9 Mar 2011 17:41:47 +0100 Subject: Bug #586461 - Remove signature also from HTML formatted emails on reply --- em-format/em-stripsig-filter.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'em-format/em-stripsig-filter.c') diff --git a/em-format/em-stripsig-filter.c b/em-format/em-stripsig-filter.c index 38b74b8f9f..bbca2f6161 100644 --- a/em-format/em-stripsig-filter.c +++ b/em-format/em-stripsig-filter.c @@ -61,6 +61,9 @@ strip_signature (CamelMimeFilter *filter, if ((inend - inptr) >= 4 && !strncmp (inptr, "-- \n", 4)) { start = inptr; inptr += 4; + } else if (!stripsig->text_plain_only && (inend - inptr) >= 7 && !g_ascii_strncasecmp (inptr, "--
", 7)) { + start = inptr; + inptr += 7; } else { while (inptr < inend && *inptr != '\n') inptr++; @@ -142,13 +145,19 @@ em_stripsig_filter_init (EMStripSigFilter *filter) /** * em_stripsig_filter_new: + * @text_plain_only: Whether should look for a text/plain signature + * delimiter "-- \n" only or also an HTML signature delimiter "--
". * * Creates a new stripsig filter. * * Returns a new stripsig filter. **/ CamelMimeFilter * -em_stripsig_filter_new (void) +em_stripsig_filter_new (gboolean text_plain_only) { - return g_object_new (EM_TYPE_STRIPSIG_FILTER, NULL); + EMStripSigFilter *filter = g_object_new (EM_TYPE_STRIPSIG_FILTER, NULL); + + filter->text_plain_only = text_plain_only; + + return CAMEL_MIME_FILTER (filter); } -- cgit v1.2.3