[evolution/webkit: 106/154] Fix parsing multipart/alternative (broken during rebase)

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

commit b72fcfd774eb2d13d162bd06dcacaffcb1c83d0c
Author: Dan VrÃtil <dvratil redhat com>
Date:   Mon Jan 9 10:36:43 2012 +0100

    Fix parsing multipart/alternative (broken during rebase)

 em-format/em-format.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/em-format/em-format.c b/em-format/em-format.c
index 96884e8..9f166dd 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -34,7 +34,7 @@
 #include "shell/e-shell.h"
 #include "shell/e-shell-settings.h"
 
-#define d(x)
+#define d(x) x
 
 struct _EMFormatPrivate {
 	GNode *current_node;
@@ -391,11 +391,6 @@ emf_parse_multipart_alternative (EMFormat *emf,
 		if (content_size == 0)
 			continue;
 
-		data_wrapper = camel_medium_get_content ((CamelMedium *) mpart);
-		ba = camel_data_wrapper_get_byte_array (data_wrapper);
-		if (ba->len == 0)
-			continue;
-
 		type = camel_mime_part_get_content_type (mpart);
 		mime_type = camel_content_type_simple (type);