From 31b57ed0383b2ea225195d4b72a872f7f2d93163 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 20 Sep 2010 23:13:43 -0400 Subject: Adapt to Camel API changes. --- modules/mail/e-mail-attachment-handler.c | 9 +++++---- modules/mail/e-mail-shell-view.c | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'modules/mail') 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); -- cgit v1.2.3