[evolution/webkit: 35/57] Fix handling multipart/alternative with more then 2 parts in prefer-plain plugin

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

commit 4408b1556ea0d903cfaae64662c52a798273420e
Author: Dan VrÃtil <dvratil redhat com>
Date:   Fri Sep 9 11:34:18 2011 +0200

    Fix handling multipart/alternative with more then 2 parts in prefer-plain plugin

 plugins/prefer-plain/prefer-plain.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index b5c98cb..4f29fef 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -85,7 +85,6 @@ make_part_attachment (EMFormat *format,
 
 		g_object_unref (new_part);
 	} else {
-		/* FIXME Not passing a GCancellable here. */
 		em_format_parse_part (format, part, part_id, &info, cancellable);
 	}
 }
@@ -146,7 +145,6 @@ org_gnome_prefer_plain_multipart_alternative (gpointer ep,
 	CamelMimePart *part, *display_part = NULL, *calendar_part = NULL;
 	gint i, nparts, partidlen, displayid = 0, calendarid = 0;
 
-	/* FIXME: this part-id stuff is poking private data, needs api */
 	partidlen = t->part_id->len;
 
 	if (epp_mode == EPP_NORMAL) {
@@ -192,11 +190,11 @@ org_gnome_prefer_plain_multipart_alternative (gpointer ep,
 		} else {
 			/* FIXME Not passing a GCancellable here. */
 			t->info->handler->old->parse_func (
-				t->format, display_part, t->part_id,
-				t->info, NULL);
+				t->format, t->part, t->part_id, t->info, NULL);
 		}
 		return;
 	} else if (!CAMEL_IS_MULTIPART (mp)) {
+		/* FIXME Not passing GCancellable here. */
 		em_format_parse_part_as (t->format, t->part, t->part_id, t->info, "x-evolution/message/source", NULL);
 		return;
 	}