diff options
Diffstat (limited to 'mail/e-mail-session-utils.c')
| -rw-r--r-- | mail/e-mail-session-utils.c | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/mail/e-mail-session-utils.c b/mail/e-mail-session-utils.c index 217e7e2e8e..eca58bcad0 100644 --- a/mail/e-mail-session-utils.c +++ b/mail/e-mail-session-utils.c @@ -131,10 +131,8 @@ mail_session_handle_draft_headers_thread (GSimpleAsyncResult *simple, e_mail_session_handle_draft_headers_sync ( session, context->message, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } gboolean @@ -249,10 +247,8 @@ mail_session_handle_source_headers_thread (GSimpleAsyncResult *simple, e_mail_session_handle_source_headers_sync ( session, context->message, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } gboolean @@ -426,8 +422,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple, /* XXX This API does not allow for cancellation. */ if (!em_utils_connect_service_sync (service, cancellable, &error)) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); + g_simple_async_result_take_error (simple, error); return; } } @@ -448,8 +443,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple, cancellable, error ? NULL : &error); if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); + g_simple_async_result_take_error (simple, error); return; } } @@ -466,8 +460,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple, if (error != NULL) { g_warn_if_fail (folder == NULL); - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); + g_simple_async_result_take_error (simple, error); return; } @@ -480,8 +473,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple, g_object_unref (folder); if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); + g_simple_async_result_take_error (simple, error); return; } } @@ -615,8 +607,7 @@ exit: /* If we were cancelled, disregard any other errors. */ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); + g_simple_async_result_take_error (simple, error); /* Stuff the accumulated error messages in a GError. */ } else if (error_messages->len > 0) { @@ -843,10 +834,8 @@ mail_session_unsubscribe_folder_thread (GSimpleAsyncResult *simple, e_mail_session_unsubscribe_folder_sync ( session, context->folder_uri, cancellable, &error); - if (error != NULL) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); - } + if (error != NULL) + g_simple_async_result_take_error (simple, error); } gboolean |