Stop relying on CamelObject meta-data.

3 files changed, 14 insertions, 15 deletions

diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index 78c46d99b4..cab253f24a 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -66,7 +66,8 @@ static void
 emfh_format_format (EMFormat *md,
                     CamelStream *stream,
                     CamelMimePart *part,
-                    const EMFormatHandler *info)
+                    const EMFormatHandler *info,
+                    gboolean is_fallback)
 {
 	struct _EMFormatHookItem *item = (EMFormatHookItem *)info;
 
@@ -77,7 +78,7 @@ emfh_format_format (EMFormat *md,
 
 		e_plugin_invoke(item->hook->hook.plugin, item->format, &target);
 	} else if (info->old) {
-		info->old->handler(md, stream, part, info->old);
+		info->old->handler(md, stream, part, info->old, FALSE);
 	}
 }
 
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 14a74af12d..ee3e4ac3e9 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -463,7 +463,7 @@ efhd_format_attachment (EMFormat *emf,
 		EM_FORMAT_HTML_VPAD);
 
 	if (handle && info->shown)
-		handle->handler (emf, stream, part, handle);
+		handle->handler (emf, stream, part, handle, FALSE);
 
 	g_free (classid);
 }
@@ -877,7 +877,7 @@ efhd_attachment_frame (EMFormat *emf,
 
 	if (info->shown)
 		info->handle->handler (
-			emf, stream, info->puri.part, info->handle);
+			emf, stream, info->puri.part, info->handle, FALSE);
 
 	camel_stream_close (stream);
 }
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 8e1cfcef3e..a8ffc2fca1 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -208,7 +208,7 @@ efh_format_exec (struct _format_msg *m)
 		if (handle != NULL)
 			handle->handler (
 				format, (CamelStream *) m->estream,
-				(CamelMimePart *) m->message, handle);
+				(CamelMimePart *) m->message, handle, FALSE);
 
 		mime_type = "x-evolution/message/rfc822";
 		handle = em_format_find_handler (format, mime_type);
@@ -216,7 +216,7 @@ efh_format_exec (struct _format_msg *m)
 		if (handle != NULL)
 			handle->handler (
 				format, (CamelStream *) m->estream,
-				(CamelMimePart *) m->message, handle);
+				(CamelMimePart *) m->message, handle, FALSE);
 	}
 
 	camel_stream_flush((CamelStream *)m->estream);
@@ -738,7 +738,7 @@ efh_format_attachment (EMFormat *emf,
 	camel_stream_write_string (stream, "</font></td></tr><tr></table>");
 
 	if (handle && em_format_is_inline (emf, emf->part_id->str, part, handle))
-		handle->handler (emf, stream, part, handle);
+		handle->handler (emf, stream, part, handle, FALSE);
 }
 
 static gboolean
@@ -1630,7 +1630,11 @@ efh_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel
 }
 
 static void
-efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info)
+efh_text_plain (EMFormatHTML *efh,
+                CamelStream *stream,
+                CamelMimePart *part,
+                const EMFormatHandler *info,
+                gboolean is_fallback)
 {
 	CamelStreamFilter *filtered_stream;
 	CamelMimeFilter *html_filter;
@@ -1641,16 +1645,10 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo
 	guint32 flags;
 	guint32 rgb;
 	gint i, count, len;
-	gchar *meta;
-	gboolean is_fallback;
 	struct _EMFormatHTMLCache *efhc;
 
 	flags = efh->text_html_flags;
 
-	meta = camel_object_meta_get (part, "EMF-Fallback");
-	is_fallback = meta != NULL;
-	g_free (meta);
-
 	dw = camel_medium_get_content_object((CamelMedium *)part);
 
 	/* Check for RFC 2646 flowed text. */
@@ -2814,7 +2812,7 @@ efh_format_message(EMFormat *emf, CamelStream *stream, CamelMimePart *part, cons
 
 	handle = em_format_find_handler(emf, "x-evolution/message/post-header");
 	if (handle)
-		handle->handler(emf, stream, part, handle);
+		handle->handler(emf, stream, part, handle, FALSE);
 
 	camel_stream_printf(stream, EM_FORMAT_HTML_VPAD);
 	em_format_part(emf, stream, part);