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(). --- e-util/e-file-request.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'e-util/e-file-request.c') diff --git a/e-util/e-file-request.c b/e-util/e-file-request.c index 62c64e34a8..08d8682261 100644 --- a/e-util/e-file-request.c +++ b/e-util/e-file-request.c @@ -93,7 +93,7 @@ file_request_send_async (SoupRequest *request, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + GSimpleAsyncResult *simple; d(printf("received request for %s\n", soup_uri_to_string (uri, FALSE))); @@ -102,10 +102,15 @@ file_request_send_async (SoupRequest *request, * which WebKit thinks it's remote, but in fact it behaves like * oridnary file:// */ - result = g_simple_async_result_new (G_OBJECT (request), callback, - user_data, file_request_send_async); - g_simple_async_result_run_in_thread (result, handle_file_request, - G_PRIORITY_DEFAULT, cancellable); + simple = g_simple_async_result_new ( + G_OBJECT (request), callback, user_data, + file_request_send_async); + + g_simple_async_result_set_check_cancellable (simple, cancellable); + + g_simple_async_result_run_in_thread ( + simple, handle_file_request, + G_PRIORITY_DEFAULT, cancellable); } static GInputStream * -- cgit