diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/calendar/e-cal-attachment-handler.c | 2 | ||||
| -rw-r--r-- | modules/mail/e-mail-attachment-handler.c | 21 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view.c | 14 |
3 files changed, 13 insertions, 24 deletions
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c index ce88a18267..ce811bf79f 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); + camel_data_wrapper_decode_to_stream (wrapper, stream, NULL); g_object_unref (stream); component = e_cal_util_parse_ics_string ((gchar *) buffer->data); diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c index 55de059d12..3240c560de 100644 --- a/modules/mail/e-mail-attachment-handler.c +++ b/modules/mail/e-mail-attachment-handler.c @@ -181,13 +181,13 @@ 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); - camel_stream_reset (stream); + camel_stream_write (stream, data, length, 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) == -1) + if (camel_data_wrapper_construct_from_stream (wrapper, stream, NULL) == -1) goto exit; store = e_attachment_view_get_store (view); @@ -221,7 +221,6 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view, guint time) { static GdkAtom atom = GDK_NONE; - CamelException ex = CAMEL_EXCEPTION_INITIALISER; CamelDataWrapper *wrapper; CamelMimeMessage *message; CamelMultipart *multipart; @@ -236,6 +235,7 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view, gpointer parent; gint length; guint ii; + GError *local_error = NULL; if (G_UNLIKELY (atom == GDK_NONE)) atom = gdk_atom_intern_static_string ("x-uid-list"); @@ -276,14 +276,14 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view, goto exit; /* The first string is the folder URI. */ - folder = mail_tool_uri_to_folder (data, 0, &ex); + folder = mail_tool_uri_to_folder (data, 0, &local_error); if (folder == NULL) goto exit; /* Handle one message. */ if (uids->len == 1) { message = camel_folder_get_message ( - folder, uids->pdata[0], &ex); + folder, uids->pdata[0], &local_error); if (message == NULL) goto exit; @@ -307,7 +307,7 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view, for (ii = 0; ii < uids->len; ii++) { message = camel_folder_get_message ( - folder, uids->pdata[ii], &ex); + folder, uids->pdata[ii], &local_error); if (message == NULL) { g_object_unref (multipart); goto exit; @@ -346,7 +346,7 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view, g_object_unref (multipart); exit: - if (camel_exception_is_set (&ex)) { + if (local_error != NULL) { const gchar *folder_name = data; if (folder != NULL) @@ -354,10 +354,9 @@ exit: e_alert_run_dialog_for_args ( parent, "mail-composer:attach-nomessages", - folder_name, camel_exception_get_description (&ex), - NULL); + folder_name, local_error->message, NULL); - camel_exception_clear (&ex); + g_clear_error (&local_error); } if (folder != NULL) diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index e69ae55220..3bee268afb 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -551,38 +551,28 @@ all_accounts: /* Add local folders. */ iter = mail_vfolder_get_sources_local (); while (iter != NULL) { - CamelException ex; - - camel_exception_init (&ex); - folder_uri = iter->data; - folder = mail_tool_uri_to_folder (folder_uri, 0, &ex); + folder = mail_tool_uri_to_folder (folder_uri, 0, NULL); if (folder != NULL) list = g_list_append (list, folder); else g_warning ("Could not open vfolder source: %s", folder_uri); - camel_exception_clear (&ex); iter = g_list_next (iter); } /* Add remote folders. */ iter = mail_vfolder_get_sources_remote (); while (iter != NULL) { - CamelException ex; - - camel_exception_init (&ex); - folder_uri = iter->data; - folder = mail_tool_uri_to_folder (folder_uri, 0, &ex); + folder = mail_tool_uri_to_folder (folder_uri, 0, NULL); if (folder != NULL) list = g_list_append (list, folder); else g_warning ("Could not open vfolder source: %s", folder_uri); - camel_exception_clear (&ex); iter = g_list_next (iter); } |