[evolution-data-server/gnome-2-30] Bug #531912 - Mail inline parser doesn't always work

[Milan Crha <mcrha src gnome org>]

commit 15b6a59772ad0700b17d1a55992c3532034347c1
Author: Milan Crha <mcrha redhat com>
Date:   Fri May 14 16:30:18 2010 +0200

    Bug #531912 - Mail inline parser doesn't always work

 camel/camel-gpg-context.c |    2 +-
 camel/camel-mime-part.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index d9c83aa..5e8cfa5 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -1827,7 +1827,7 @@ gpg_decrypt(CamelCipherContext *context, CamelMimePart *ipart, CamelMimePart *op
 		return NULL;
 	}
 
-	ct = camel_mime_part_get_content_type((CamelMimePart *)content);
+	ct = camel_data_wrapper_get_mime_type_field (content);
 	/* Encrypted part (using our fake mime type) or PGP/Mime multipart */
 	if (camel_content_type_is(ct, "multipart", "encrypted")) {
 		mp = (CamelMultipart *) camel_medium_get_content_object ((CamelMedium *) ipart);
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index f9f3322..4fc062f 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -714,7 +714,7 @@ camel_mime_part_set_content_type (CamelMimePart *mime_part, const gchar *content
 CamelContentType *
 camel_mime_part_get_content_type (CamelMimePart *mime_part)
 {
-	return ((CamelDataWrapper *) mime_part)->mime_type;
+	return camel_data_wrapper_get_mime_type_field ((CamelDataWrapper *) mime_part);
 }
 
 static void