Use g_simple_async_result_set_check_cancellable().

Always call it immediately after g_simple_async_result_new().

4 files changed, 36 insertions, 0 deletions

diff --git a/libemail-engine/e-mail-folder-utils.c b/libemail-engine/e-mail-folder-utils.c
index ddf2bcf54d..6d2f3f499f 100644
--- a/libemail-engine/e-mail-folder-utils.c
+++ b/libemail-engine/e-mail-folder-utils.c
@@ -147,6 +147,8 @@ e_mail_folder_append_message (CamelFolder *folder,
 		G_OBJECT (folder), callback, user_data,
 		e_mail_folder_append_message);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
@@ -301,6 +303,8 @@ e_mail_folder_build_attachment (CamelFolder *folder,
 		G_OBJECT (folder), callback, user_data,
 		e_mail_folder_build_attachment);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
@@ -558,6 +562,8 @@ e_mail_folder_find_duplicate_messages (CamelFolder *folder,
 		G_OBJECT (folder), callback, user_data,
 		e_mail_folder_find_duplicate_messages);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
@@ -686,6 +692,8 @@ e_mail_folder_get_multiple_messages (CamelFolder *folder,
 		G_OBJECT (folder), callback, user_data,
 		e_mail_folder_get_multiple_messages);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
@@ -916,6 +924,8 @@ e_mail_folder_remove (CamelFolder *folder,
 		G_OBJECT (folder), callback,
 		user_data, e_mail_folder_remove);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_run_in_thread (
 		simple, mail_folder_remove_thread,
 		io_priority, cancellable);
@@ -1127,6 +1137,8 @@ e_mail_folder_remove_attachments (CamelFolder *folder,
 		G_OBJECT (folder), callback, user_data,
 		e_mail_folder_remove_attachments);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
@@ -1377,6 +1389,8 @@ e_mail_folder_save_messages (CamelFolder *folder,
 		G_OBJECT (folder), callback, user_data,
 		e_mail_folder_save_messages);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
diff --git a/libemail-engine/e-mail-session-utils.c b/libemail-engine/e-mail-session-utils.c
index 81ad83ed9b..403ba57ae9 100644
--- a/libemail-engine/e-mail-session-utils.c
+++ b/libemail-engine/e-mail-session-utils.c
@@ -205,6 +205,8 @@ e_mail_session_handle_draft_headers (EMailSession *session,
 		G_OBJECT (session), callback, user_data,
 		e_mail_session_handle_draft_headers);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
@@ -356,6 +358,8 @@ e_mail_session_handle_source_headers (EMailSession *session,
 		G_OBJECT (session), callback, user_data,
 		e_mail_session_handle_source_headers);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
@@ -819,6 +823,8 @@ e_mail_session_send_to (EMailSession *session,
 		G_OBJECT (session), callback,
 		user_data, e_mail_session_send_to);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
@@ -927,6 +933,8 @@ e_mail_session_unsubscribe_folder (EMailSession *session,
 		G_OBJECT (session), callback, user_data,
 		e_mail_session_unsubscribe_folder);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index 0b1625f7c9..475f8024aa 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -1738,6 +1738,8 @@ e_mail_session_get_inbox (EMailSession *session,
 		G_OBJECT (session), callback,
 		user_data, e_mail_session_get_inbox);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
@@ -1835,6 +1837,8 @@ e_mail_session_get_trash (EMailSession *session,
 		G_OBJECT (session), callback,
 		user_data, e_mail_session_get_trash);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
@@ -1948,6 +1952,8 @@ e_mail_session_uri_to_folder (EMailSession *session,
 		G_OBJECT (session), callback,
 		user_data, e_mail_session_uri_to_folder);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
diff --git a/libemail-engine/e-mail-store-utils.c b/libemail-engine/e-mail-store-utils.c
index 2f5b044426..9719c0d353 100644
--- a/libemail-engine/e-mail-store-utils.c
+++ b/libemail-engine/e-mail-store-utils.c
@@ -122,6 +122,8 @@ e_mail_store_create_folder (CamelStore *store,
 		G_OBJECT (store), callback, user_data,
 		e_mail_store_create_folder);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_set_op_res_gpointer (
 		simple, context, (GDestroyNotify) async_context_free);
 
@@ -216,6 +218,8 @@ e_mail_store_go_offline (CamelStore *store,
 		G_OBJECT (store), callback,
 		user_data, e_mail_store_go_offline);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_run_in_thread (
 		simple, (GSimpleAsyncThreadFunc)
 		mail_store_go_offline_thread,
@@ -291,6 +295,8 @@ e_mail_store_go_online (CamelStore *store,
 		G_OBJECT (store), callback,
 		user_data, e_mail_store_go_online);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_run_in_thread (
 		simple, (GSimpleAsyncThreadFunc)
 		mail_store_go_online_thread,
@@ -364,6 +370,8 @@ e_mail_store_prepare_for_offline (CamelStore *store,
 		G_OBJECT (store), callback, user_data,
 		e_mail_store_prepare_for_offline);
 
+	g_simple_async_result_set_check_cancellable (simple, cancellable);
+
 	g_simple_async_result_run_in_thread (
 		simple, (GSimpleAsyncThreadFunc)
 		mail_store_prepare_for_offline_thread,