From 53a3d2f4e1473dd93fee8e7367bc329b8dc5ef23 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 13 May 2012 09:29:38 -0400 Subject: Use g_simple_async_result_set_check_cancellable(). Always call it immediately after g_simple_async_result_new(). --- mail/e-mail-request.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'mail/e-mail-request.c') diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c index 8a51b2a226..d36e0cba2e 100644 --- a/mail/e-mail-request.c +++ b/mail/e-mail-request.c @@ -180,7 +180,7 @@ mail_request_send_async (SoupRequest *request, { SoupSession *session; EMailRequest *emr = E_MAIL_REQUEST (request); - GSimpleAsyncResult *result; + GSimpleAsyncResult *simple; SoupURI *uri; GHashTable *formatters; gchar *uri_str; @@ -209,10 +209,15 @@ mail_request_send_async (SoupRequest *request, /* Make sure the formatter lives until we are finished here */ g_object_ref (emr->priv->efh); - result = g_simple_async_result_new (G_OBJECT (request), callback, - user_data, mail_request_send_async); - g_simple_async_result_run_in_thread (result, handle_mail_request, - G_PRIORITY_DEFAULT, cancellable); + simple = g_simple_async_result_new ( + G_OBJECT (request), callback, + user_data, mail_request_send_async); + + g_simple_async_result_set_check_cancellable (simple, cancellable); + + g_simple_async_result_run_in_thread ( + simple, handle_mail_request, + G_PRIORITY_DEFAULT, cancellable); } static GInputStream * -- cgit