[evolution/webkit: 108/146] Improve handling attachments
- From: Dan VrÃtil <dvratil src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/webkit: 108/146] Improve handling attachments
- Date: Thu, 9 Feb 2012 14:27:32 +0000 (UTC)
commit 7687f23358461de41bd5b21747a5a089033bf06f
Author: Dan VrÃtil <dvratil redhat com>
Date: Mon Jan 9 10:40:10 2012 +0100
Improve handling attachments
- make sure we are not trying to parse attachment as an attachment again
mail/em-format-html-display.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 5258144..ce73965 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -516,7 +516,8 @@ efhd_parse_attachment (EMFormat *emf,
/* Though it is an attachment, we still might be able to parse it and
* so discover some parts that we might be event able to display. */
- if (handler && handler->parse_func && (handler->parse_func != efhd_parse_attachment) &&
+ if (handler && handler->parse_func && (handler->parse_func != efhd_parse_attachment)&&
+ (info->handler->parse_func != efhd_parse_attachment) &&
((handler->flags & EM_FORMAT_HANDLER_COMPOUND_TYPE) ||
(handler->flags & EM_FORMAT_HANDLER_INLINE_DISPOSITION))) {
EMFormatParserInfo attachment_info = { .handler = handler,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]