From 3da4948c0fc1f2c21b163f0ec456b2d99c881258 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 7 Sep 2013 12:31:19 -0400 Subject: Miscellaneous cleanups. --- libemail-engine/mail-tools.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'libemail-engine/mail-tools.c') diff --git a/libemail-engine/mail-tools.c b/libemail-engine/mail-tools.c index 00cd653509..5961de67f6 100644 --- a/libemail-engine/mail-tools.c +++ b/libemail-engine/mail-tools.c @@ -192,14 +192,22 @@ mail_tool_generate_forward_subject (CamelMimeMessage *msg) struct _camel_header_raw * mail_tool_remove_xevolution_headers (CamelMimeMessage *message) { + struct _camel_header_raw *headers; struct _camel_header_raw *scan, *list = NULL; - for (scan = ((CamelMimePart *) message)->headers; scan; scan = scan->next) - if (!strncmp (scan->name, "X-Evolution", 11)) - camel_header_raw_append (&list, scan->name, scan->value, scan->offset); + headers = CAMEL_MIME_PART (message)->headers; - for (scan = list; scan; scan = scan->next) - camel_medium_remove_header ((CamelMedium *) message, scan->name); + for (scan = headers; scan != NULL; scan = scan->next) { + if (strncmp (scan->name, "X-Evolution", 11) == 0) + camel_header_raw_append ( + &list, scan->name, + scan->value, scan->offset); + } + + for (scan = list; scan; scan = scan->next) { + camel_medium_remove_header ( + CAMEL_MEDIUM (message), scan->name); + } return list; } -- cgit v1.2.3