Adapt to Camel API changes.

4 files changed, 13 insertions, 13 deletions

diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index 26717d79b6..8fd2080769 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -80,7 +80,7 @@ attachment_handler_get_component (EAttachment *attachment)
 	stream = camel_stream_mem_new ();
 	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), buffer);
 	wrapper = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
-	camel_data_wrapper_decode_to_stream (wrapper, stream, NULL);
+	camel_data_wrapper_decode_to_stream_sync (wrapper, stream, NULL, NULL);
 	g_object_unref (stream);
 
 	component = e_cal_util_parse_ics_string ((gchar *) buffer->data);
diff --git a/modules/composer-autosave/e-autosave-utils.c b/modules/composer-autosave/e-autosave-utils.c
index ec0e322322..8dc9285884 100644
--- a/modules/composer-autosave/e-autosave-utils.c
+++ b/modules/composer-autosave/e-autosave-utils.c
@@ -140,8 +140,8 @@ load_snapshot_loaded_cb (GFile *snapshot_file,
 	 * and feeding the parser a direct file stream would block. */
 	message = camel_mime_message_new ();
 	camel_stream = camel_stream_mem_new_with_buffer (contents, length);
-	camel_data_wrapper_construct_from_stream (
-		CAMEL_DATA_WRAPPER (message), camel_stream, &error);
+	camel_data_wrapper_construct_from_stream_sync (
+		CAMEL_DATA_WRAPPER (message), camel_stream, NULL, &error);
 	g_object_unref (camel_stream);
 	g_free (contents);
 
@@ -161,7 +161,7 @@ load_snapshot_loaded_cb (GFile *snapshot_file,
 	 * the same file. */
 	shell = E_SHELL (object);
 	g_object_ref (snapshot_file);
-	composer = e_msg_composer_new_with_message (shell, message);
+	composer = e_msg_composer_new_with_message (shell, message, NULL);
 	g_object_set_data_full (
 		G_OBJECT (composer),
 		SNAPSHOT_FILE_KEY, snapshot_file,
@@ -228,7 +228,8 @@ save_snapshot_replace_cb (GFile *snapshot_file,
 
 	/* Extract a MIME message from the composer. */
 	composer = E_MSG_COMPOSER (object);
-	message = e_msg_composer_get_message_draft (composer, &error);
+	message = e_msg_composer_get_message_draft (
+		composer, context->cancellable, &error);
 
 	g_object_unref (object);
 
@@ -251,8 +252,8 @@ save_snapshot_replace_cb (GFile *snapshot_file,
 	camel_stream = camel_stream_mem_new ();
 	camel_stream_mem_set_byte_array (
 		CAMEL_STREAM_MEM (camel_stream), buffer);
-	camel_data_wrapper_decode_to_stream (
-		CAMEL_DATA_WRAPPER (message), camel_stream, NULL);
+	camel_data_wrapper_decode_to_stream_sync (
+		CAMEL_DATA_WRAPPER (message), camel_stream, NULL, NULL);
 	g_object_unref (camel_stream);
 	g_object_unref (message);
 
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 99d16e9a34..55ffc808fd 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -193,13 +193,14 @@ mail_attachment_handler_message_rfc822 (EAttachmentView *view,
 	length = gtk_selection_data_get_length (selection_data);
 
 	stream = camel_stream_mem_new ();
-	camel_stream_write (stream, data, length, NULL);
+	camel_stream_write (stream, data, length, NULL, NULL);
 	camel_stream_reset (stream, NULL);
 
 	message = camel_mime_message_new ();
 	wrapper = CAMEL_DATA_WRAPPER (message);
 
-	if (camel_data_wrapper_construct_from_stream (wrapper, stream, NULL) == -1)
+	if (!camel_data_wrapper_construct_from_stream_sync (
+		wrapper, stream, NULL, NULL))
 		goto exit;
 
 	store = e_attachment_view_get_store (view);
@@ -296,7 +297,7 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
 	/* Handle one message. */
 	if (uids->len == 1) {
 		/* FIXME Not passing a GCancellable here. */
-		message = camel_folder_get_message (
+		message = camel_folder_get_message_sync (
 			folder, uids->pdata[0], NULL, &local_error);
 		if (message == NULL)
 			goto exit;
@@ -321,7 +322,7 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
 
 	for (ii = 0; ii < uids->len; ii++) {
 		/* FIXME Not passing a GCancellable here. */
-		message = camel_folder_get_message (
+		message = camel_folder_get_message_sync (
 			folder, uids->pdata[ii], NULL, &local_error);
 		if (message == NULL) {
 			g_object_unref (multipart);
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index f6603446ea..b95153ed42 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -59,8 +59,6 @@ search_results_exec (SearchResultsMsg *msg)
 {
 	GList *copied_list;
 
-	camel_operation_register (msg->cancel);
-
 	copied_list = g_list_copy (msg->folder_list);
 	g_list_foreach (copied_list, (GFunc) g_object_ref, NULL);