[evolution-mapi] Adapt to Camel API changes.

[Matthew Barnes <mbarnes src gnome org>]

commit b950cad63fcb70dd0f4d62ea6a473973c1129005
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Apr 3 20:07:13 2010 -0400

    Adapt to Camel API changes.

 src/camel/camel-mapi-folder.c    |   10 +++++-----
 src/camel/camel-mapi-summary.c   |    3 ---
 src/camel/camel-mapi-transport.c |    2 +-
 src/camel/camel-mapi-utils.c     |   10 +++++-----
 4 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index c7963c1..774bd28 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -1685,8 +1685,8 @@ mapi_mime_build_multipart_alternative (MapiItem *item, GSList *body_parts, GSLis
 			CamelMultipart *m_related;
 			m_related = mapi_mime_build_multipart_related (item, stream,
 								       inline_attachs);
-			camel_medium_set_content_object (CAMEL_MEDIUM (part),
-							 CAMEL_DATA_WRAPPER (m_related));
+			camel_medium_set_content (CAMEL_MEDIUM (part),
+						  CAMEL_DATA_WRAPPER (m_related));
 			camel_object_unref (m_related);
 		} else
 			part = mapi_mime_msg_body (item, stream);
@@ -1707,7 +1707,7 @@ mapi_mime_build_multipart_mixed (CamelMultipart *content, GSList *attachs)
 					  "multipart/mixed");
 	camel_multipart_set_boundary (m_mixed, NULL);
 
-	camel_medium_set_content_object (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (content));
+	camel_medium_set_content (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (content));
 	camel_multipart_add_part (m_mixed, part);
 
 	if (attachs)
@@ -1817,7 +1817,7 @@ mapi_folder_item_to_msg( CamelFolder *folder, MapiItem *item, CamelException *ex
 								  noninline_attachs);
 	}
 
-	camel_medium_set_content_object(CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER(multipart_body));
+	camel_medium_set_content (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER(multipart_body));
 	camel_object_unref (multipart_body);
 
 	return msg;
@@ -2343,7 +2343,7 @@ camel_mapi_folder_new (CamelStore *store, const char *folder_name, const char *f
 	camel_object_state_read(folder);
 
 	state_file = g_strdup_printf ("%s/%s", folder_dir, folder_name);
-	mapi_folder->cache = camel_data_cache_new (state_file, 0, ex);
+	mapi_folder->cache = camel_data_cache_new (state_file, ex);
 	g_free (state_file);
 	if (!mapi_folder->cache) {
 		camel_object_unref (folder);
diff --git a/src/camel/camel-mapi-summary.c b/src/camel/camel-mapi-summary.c
index 50dedec..b88da36 100644
--- a/src/camel/camel-mapi-summary.c
+++ b/src/camel/camel-mapi-summary.c
@@ -275,9 +275,6 @@ mapi_summary_clear (CamelFolderSummary *summary, gboolean uncache)
 
 	camel_folder_summary_clear_db (summary);
 
-	if (uncache)
-		camel_data_cache_clear (((CamelMapiFolder *) summary->folder)->cache, "cache", NULL);
-
 	if (camel_folder_change_info_changed (changes))
 		camel_object_trigger_event (summary->folder, "folder_changed", changes);
 	camel_folder_change_info_free (changes);
diff --git a/src/camel/camel-mapi-transport.c b/src/camel/camel-mapi-transport.c
index b053006..286403a 100644
--- a/src/camel/camel-mapi-transport.c
+++ b/src/camel/camel-mapi-transport.c
@@ -78,7 +78,7 @@ mapi_send_to (CamelTransport *transport, CamelMimeMessage *message,
 	const char *addressp;
 	mapi_id_t st = 0;
 
-	if (!camel_internet_address_get((const CamelInternetAddress *)from, 0, &namep, &addressp)) {
+	if (!camel_internet_address_get((CamelInternetAddress *)from, 0, &namep, &addressp)) {
 		return (FALSE);
 	}
 
diff --git a/src/camel/camel-mapi-utils.c b/src/camel/camel-mapi-utils.c
index 4695289..5689ae0 100644
--- a/src/camel/camel-mapi-utils.c
+++ b/src/camel/camel-mapi-utils.c
@@ -266,7 +266,7 @@ mapi_do_multipart (CamelMultipart *mp, MapiItem *item, gboolean *is_first)
 	for (i_part = 0; i_part < n_part; i_part++) {
 		/* getting part */
 		part = camel_multipart_get_part(mp, i_part);
-		dw = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+		dw = camel_medium_get_content (CAMEL_MEDIUM (part));
 		if (CAMEL_IS_MULTIPART(dw)) {
 			/* recursive */
 			if (!mapi_do_multipart (CAMEL_MULTIPART (dw), item, is_first))
@@ -307,7 +307,7 @@ camel_mapi_utils_mime_to_item (CamelMimeMessage *message, CamelAddress *from, Ca
 	CamelContentType *type;
 	CamelStream *content_stream;
 	CamelMultipart *multipart;
-	const CamelInternetAddress *to, *cc, *bcc;
+	CamelInternetAddress *to, *cc, *bcc;
 	MapiItem *item = g_new0 (MapiItem, 1);
 	const char *namep;
 	const char *addressp;
@@ -320,7 +320,7 @@ camel_mapi_utils_mime_to_item (CamelMimeMessage *message, CamelAddress *from, Ca
 	/* headers */
 
 	if (from) {
-		if (!camel_internet_address_get ((const CamelInternetAddress *)from, 0, &namep, &addressp)) {
+		if (!camel_internet_address_get ((CamelInternetAddress *)from, 0, &namep, &addressp)) {
 			g_warning ("%s: Invalid 'from' passed in", G_STRFUNC);
 			g_free (item);
 			return NULL;
@@ -357,14 +357,14 @@ camel_mapi_utils_mime_to_item (CamelMimeMessage *message, CamelAddress *from, Ca
 	item->header.message_id = g_strdup (camel_medium_get_header ((CamelMedium *) message, "Message-ID"));
 
 	/* contents body */
-	multipart = (CamelMultipart *)camel_medium_get_content_object (CAMEL_MEDIUM (message));
+	multipart = (CamelMultipart *)camel_medium_get_content (CAMEL_MEDIUM (message));
 
 	if (CAMEL_IS_MULTIPART(multipart)) {
 		gboolean is_first = TRUE;
 		if (!mapi_do_multipart (CAMEL_MULTIPART(multipart), item, &is_first))
 			printf("camel message multi part error\n"); 
 	} else {
-		dw = camel_medium_get_content_object (CAMEL_MEDIUM (message));
+		dw = camel_medium_get_content (CAMEL_MEDIUM (message));
 		if (dw) {
 			type = camel_mime_part_get_content_type((CamelMimePart *)message);
 			content_type = camel_content_type_simple (type);