[evolution/webkit: 116/124] No meeting invitation rendering for emails (bug #667538)

[Dan VrÃtil <dvratil src gnome org>]

commit 64a453c7a216ac60f292199527e9ea064a04d96e
Author: Dan VrÃtil <dvratil redhat com>
Date:   Thu Jan 12 18:56:40 2012 +0100

    No meeting invitation rendering for emails (bug #667538)
    
    The itip-formatter didn't store it's created PURI in EMFormat

 mail/em-format-html-display.c           |    1 -
 plugins/itip-formatter/itip-formatter.c |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index e9e8730..10c2e04 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -519,7 +519,6 @@ 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)&&
-            (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,
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 51ad386..5aa8efa 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -3113,6 +3113,8 @@ format_itip (EPlugin *ep,
 	puri->cancellable = g_cancellable_new ();
 	puri->real_comps = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
 
+	em_format_add_puri (target->format, (EMFormatPURI *) puri);
+
 	g_object_unref (settings);
 
 	/* This is non-gui thread. Download the part for using in the main thread */