Use CamelContentType, and use header_content_type_is instead of doing it

	* mail-format.c (mail_part_is_inline, mail_get_message_body): Use
	CamelContentType, and use header_content_type_is instead of doing
	it by hand.

	(handle_text_plain):
	(handle_multipart_related):
	(find_preferred_alternative):
	(handle_message_external_body): Use CamelContentType and
	header_content_type_* functions instead of GMimeContentField.

	* mail-display.c (write_data_to_file, launch_cb): Use
	CamelContentType and header_content_type_* functions instead of
	GMimeContentField.

svn path=/trunk/; revision=7189

1 files changed, 5 insertions, 5 deletions

diff --git a/mail/mail-display.c b/mail/mail-display.c
index 41a5daad1a..46946bf6ab 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -60,7 +60,7 @@ static gboolean
 write_data_to_file (CamelMimePart *part, const char *name, gboolean unique)
 {
 	CamelMimeFilterCharset *charsetfilter;
-	GMimeContentField *content_type;
+	CamelContentType *content_type;
 	CamelStreamFilter *filtered_stream;
 	CamelStream *stream_fs;
 	CamelDataWrapper *data;
@@ -110,8 +110,8 @@ write_data_to_file (CamelMimePart *part, const char *name, gboolean unique)
 	   the same algorithm camel uses */
 	
 	content_type = camel_mime_part_get_content_type (part);
-	if (gmime_content_field_is_type(content_type, "text", "*")
-	    && (charset = gmime_content_field_get_parameter (content_type, "charset"))
+	if (header_content_type_is(content_type, "text", "*")
+	    && (charset = header_content_type_param (content_type, "charset"))
 	    && strcasecmp(charset, "utf-8") != 0) {
 		charsetfilter = camel_mime_filter_charset_new_convert ("utf-8", charset);
 		filtered_stream = camel_stream_filter_new_with_stream (stream_fs);
@@ -245,11 +245,11 @@ launch_cb (GtkWidget *widget, gpointer user_data)
 {
 	CamelMimePart *part = gtk_object_get_data (user_data, "CamelMimePart");
 	GnomeVFSMimeApplication *app;
-	GMimeContentField *content_type;
+	CamelContentType *content_type;
 	char *mime_type, *tmpl, *tmpdir, *filename, *argv[2];
 
 	content_type = camel_mime_part_get_content_type (part);
-	mime_type = gmime_content_field_get_mime_type (content_type);
+	mime_type = header_content_type_format (content_type);
 	app = gnome_vfs_mime_get_default_application (mime_type);
 	g_free (mime_type);