[evolution/webkit: 173/182] Don't write attachments at all since the attachment writer handles this now

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

commit 5673118f821b6d6ddd882e7254e4ed62aead8e92
Author: Dan VrÃtil <dvratil redhat com>
Date:   Fri Feb 24 14:18:19 2012 +0100

    Don't write attachments at all since the attachment writer handles this now

 mail/em-format-html.c                   |   13 ++++++-------
 plugins/itip-formatter/itip-formatter.c |    1 +
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 592194d..6d74baa 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1373,13 +1373,12 @@ efh_write_message (EMFormat *emf,
                         continue;
                 }
 
-                if ((puri->write_func && !puri->is_attachment) ||
-                        (puri->write_func && puri->widget_func && puri->is_attachment)) {
-                        puri->write_func (emf, puri, stream, info, cancellable);
-                                d(printf("Writing PURI %s\n", puri->uri));
-                        } else {
-                                d(printf("Skipping PURI %s\n", puri->uri));
-                        }
+                if (puri->write_func && !puri->is_attachment) {
+			puri->write_func (emf, puri, stream, info, cancellable);
+			d(printf("Writing PURI %s\n", puri->uri));
+		} else {
+			d(printf("Skipping PURI %s\n", puri->uri));
+		}
         }
 
         camel_stream_write_string (stream, "</body></html>", cancellable, NULL);
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 5d2d9a3..c69115f 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -3129,6 +3129,7 @@ format_itip (EPlugin *ep,
 	puri->puri.write_func = write_itip_object;
 	puri->puri.widget_func = format_itip_object;
 	puri->puri.free = puri_free;
+	puri->puri.is_attachment = FALSE;
 	puri->delete_message = g_settings_get_boolean (settings, CONF_KEY_DELETE);
 	puri->has_organizer = FALSE;
 	puri->no_reply_wanted = FALSE;