[evolution-exchange/camel-gobject: 4/6] Adapt to CamelMedium API changes.

[Matthew Barnes <mbarnes src gnome org>]

commit e6bdc8d8a3f2e586aea0f43263478390beb09b71
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Nov 28 19:17:43 2009 -0500

    Adapt to CamelMedium API changes.
    
    camel_medium_get_content_object() -> camel_medium_get_content()
    camel_medium_set_content_object() -> camel_medium_set_content()

 addressbook/e-book-backend-exchange.c |   10 +++++-----
 calendar/e-cal-backend-exchange.c     |   10 +++++-----
 camel/camel-exchange-folder.c         |    4 ++--
 eplugin/exchange-delegates-user.c     |    6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/addressbook/e-book-backend-exchange.c b/addressbook/e-book-backend-exchange.c
index c367d6c..8047c14 100644
--- a/addressbook/e-book-backend-exchange.c
+++ b/addressbook/e-book-backend-exchange.c
@@ -524,7 +524,7 @@ e_contact_from_props (EBookBackendExchange *be, E2kResult *result)
 	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), stream);
 	g_object_unref (stream);
 
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (msg));
+	content = camel_medium_get_content (CAMEL_MEDIUM (msg));
 	if (CAMEL_IS_MULTIPART (content)) {
 		multipart = (CamelMultipart *)content;
 		content = NULL;
@@ -533,7 +533,7 @@ e_contact_from_props (EBookBackendExchange *be, E2kResult *result)
 			part = camel_multipart_get_part (multipart, i);
 			filename = camel_mime_part_get_filename (part);
 			if (filename && !strncmp (filename, "ContactPicture.", 15)) {
-				content = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+				content = camel_medium_get_content (CAMEL_MEDIUM (part));
 				break;
 			}
 		}
@@ -1380,7 +1380,7 @@ build_message (const gchar *from_name, const gchar *from_email,
 		text_part = CAMEL_MIME_PART (msg);
 
 	if (text_part) {
-		camel_medium_set_content_object (CAMEL_MEDIUM (text_part), wrapper);
+		camel_medium_set_content (CAMEL_MEDIUM (text_part), wrapper);
 		camel_mime_part_set_encoding (text_part, CAMEL_TRANSFER_ENCODING_8BIT);
 	}
 	if (photo) {
@@ -1423,7 +1423,7 @@ build_message (const gchar *from_name, const gchar *from_email,
 		camel_data_wrapper_set_mime_type (wrapper, content_type);
 
 		photo_part = camel_mime_part_new ();
-		camel_medium_set_content_object (CAMEL_MEDIUM (photo_part),
+		camel_medium_set_content (CAMEL_MEDIUM (photo_part),
 						 wrapper);
 		camel_mime_part_set_encoding (photo_part, CAMEL_TRANSFER_ENCODING_BASE64);
 		camel_mime_part_set_description (photo_part, filename);
@@ -1441,7 +1441,7 @@ build_message (const gchar *from_name, const gchar *from_email,
 		camel_multipart_add_part (multipart, photo_part);
 		g_object_unref (photo_part);
 
-		camel_medium_set_content_object (CAMEL_MEDIUM (msg),
+		camel_medium_set_content (CAMEL_MEDIUM (msg),
 						 CAMEL_DATA_WRAPPER (multipart));
 		g_object_unref (multipart);
 	}
diff --git a/calendar/e-cal-backend-exchange.c b/calendar/e-cal-backend-exchange.c
index b9697a2..ed48c1f 100644
--- a/calendar/e-cal-backend-exchange.c
+++ b/calendar/e-cal-backend-exchange.c
@@ -1741,7 +1741,7 @@ get_attachment (ECalBackendExchange *cbex, const gchar *uid,
 	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), stream);
 	g_object_unref (stream);
 
-	msg_content = camel_medium_get_content_object (CAMEL_MEDIUM (msg));
+	msg_content = camel_medium_get_content (CAMEL_MEDIUM (msg));
 	if (msg_content && CAMEL_IS_MULTIPART (msg_content)) {
 		multipart = (CamelMultipart *)msg_content;
 
@@ -1751,7 +1751,7 @@ get_attachment (ECalBackendExchange *cbex, const gchar *uid,
 			if (filename) {
 				CamelStreamMem *stream_mem;
 
-				content = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+				content = camel_medium_get_content (CAMEL_MEDIUM (part));
 
 				stream = camel_stream_mem_new ();
 				stream_mem = (CamelStreamMem *)stream;
@@ -2048,7 +2048,7 @@ build_msg ( ECalBackendExchange *cbex, ECalComponent *comp, const gchar *subject
 
 		mime_part = camel_mime_part_new ();
 
-		camel_medium_set_content_object (CAMEL_MEDIUM (mime_part), wrapper);
+		camel_medium_set_content (CAMEL_MEDIUM (mime_part), wrapper);
 		camel_mime_part_set_filename (mime_part, mime_filename);
 		camel_mime_part_set_encoding (mime_part, CAMEL_TRANSFER_ENCODING_BASE64);
 		cid = camel_header_msgid_generate ();
@@ -2069,11 +2069,11 @@ build_msg ( ECalBackendExchange *cbex, ECalComponent *comp, const gchar *subject
 	}
 	e_cal_component_set_attachment_list (comp, new_attach_list);
 
-	camel_medium_set_content_object (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (multipart));
+	camel_medium_set_content (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (multipart));
 	g_object_unref (multipart);
 
 	content = (CamelStreamMem *)camel_stream_mem_new();
-	dw = camel_medium_get_content_object (CAMEL_MEDIUM (msg));
+	dw = camel_medium_get_content (CAMEL_MEDIUM (msg));
 	camel_data_wrapper_decode_to_stream(dw, (CamelStream *)content);
 	buffer = g_memdup (content->buffer->data, content->buffer->len);
 	buffer[content->buffer->len] = '\0';
diff --git a/camel/camel-exchange-folder.c b/camel/camel-exchange-folder.c
index 9cebcc7..9b5a396 100644
--- a/camel/camel-exchange-folder.c
+++ b/camel/camel-exchange-folder.c
@@ -299,7 +299,7 @@ fix_broken_multipart_related (CamelMimePart *part)
 	CamelMimePart *subpart;
 	gint i, count, broken_parts;
 
-	content = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+	content = camel_medium_get_content (CAMEL_MEDIUM (part));
 
 	content_type = content->mime_type;
 	if (camel_content_type_is (content_type, "message", "rfc822")) {
@@ -338,7 +338,7 @@ fix_broken_multipart_related (CamelMimePart *part)
 			camel_multipart_add_part (new, subpart);
 		}
 
-		camel_medium_set_content_object (CAMEL_MEDIUM (part),
+		camel_medium_set_content (CAMEL_MEDIUM (part),
 						 CAMEL_DATA_WRAPPER (new));
 		g_object_unref (CAMEL_OBJECT (new));
 	}
diff --git a/eplugin/exchange-delegates-user.c b/eplugin/exchange-delegates-user.c
index 0a691cd..f2af57d 100644
--- a/eplugin/exchange-delegates-user.c
+++ b/eplugin/exchange-delegates-user.c
@@ -470,7 +470,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			g_object_unref (stream);
 
 			part = camel_mime_part_new ();
-			camel_medium_set_content_object (CAMEL_MEDIUM (part), delegate_mail_text);
+			camel_medium_set_content (CAMEL_MEDIUM (part), delegate_mail_text);
 			g_object_unref (delegate_mail_text);
 			camel_multipart_add_part (body, part);
 			g_object_unref (part);
@@ -485,13 +485,13 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 
 			camel_data_wrapper_construct_from_stream (delegate_mail_data, stream);
 			g_object_unref (stream);
-			camel_medium_set_content_object (CAMEL_MEDIUM (part), delegate_mail_data);
+			camel_medium_set_content (CAMEL_MEDIUM (part), delegate_mail_data);
 			g_object_unref (delegate_mail_data);
 			camel_multipart_add_part (body, part);
 			g_object_unref (part);
 
 			/* Finish creating the message */
-			camel_medium_set_content_object (CAMEL_MEDIUM (delegate_mail), CAMEL_DATA_WRAPPER (body));
+			camel_medium_set_content (CAMEL_MEDIUM (delegate_mail), CAMEL_DATA_WRAPPER (body));
 			g_object_unref (body);
 
 			delegate_mail_subject = g_strdup_printf (_("You have been designated "