From 045e5c596ac1dd3fe3dfa2e7e9a1274164bd85ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Fri, 11 Oct 2024 09:24:37 +0000 Subject: [PATCH] M!141 - message-list: Access RegenData from GTask task_data As we can't be sure that the returned data will be a valid RegenData, use the task_data as we are sure that it will be always there. Fixes: 94ca1e88 Closes https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/141 --- src/mail/message-list.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/mail/message-list.c b/src/mail/message-list.c index 73c6c52e5e..e86ad2819d 100644 --- a/src/mail/message-list.c +++ b/src/mail/message-list.c @@ -6363,9 +6363,7 @@ message_list_regen_thread (GTask *task, } exit_successfully: - g_task_return_pointer (task, - regen_data_ref (regen_data), - (GDestroyNotify) regen_data_unref); + g_task_return_boolean (task, TRUE); exit: if (searchuids != NULL) camel_folder_search_free (folder, searchuids); @@ -6544,7 +6542,8 @@ message_list_regen_done_cb (GObject *source_object, GError *local_error = NULL; message_list = MESSAGE_LIST (source_object); - regen_data = g_task_propagate_pointer (G_TASK (result), &local_error); + regen_data = g_task_get_task_data (G_TASK (result)); + g_task_propagate_boolean (G_TASK (result), &local_error); /* Withdraw our RegenData from the private struct, if it hasn't * already been replaced. We have exclusive access to it now. */ @@ -6913,8 +6912,6 @@ message_list_regen_done_cb (GObject *source_object, 0, CAMEL_MESSAGE_SEEN); } } - - g_clear_pointer (®en_data, regen_data_unref); } static gboolean