luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/kabus/task-return' into 'main'

Browse Source 
Use g_task_return in task threads

See merge request GNOME/glib!3633
This commit is contained in:
Michael Catanzaro 2023-10-12 12:27:29 +00:00
commit 046f70cc0d
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdbusinterfaceskeleton.c
View File

@ -568,6 +568,8 @@ dispatch_in_thread_func (GTask *task,
if (object != NULL)
g_object_unref (object);
g_task_return_boolean (task, TRUE);
}
static void

24
gio/gfile.c
View File

@ -6774,8 +6774,6 @@ g_file_real_set_display_name_finish (GFile *file,
typedef struct {
GFileQueryInfoFlags flags;
GFileInfo *info;
gboolean res;
GError *error;
} SetInfoAsyncData;
static void
@ -6783,8 +6781,6 @@ set_info_data_free (SetInfoAsyncData *data)
{
if (data->info)
g_object_unref (data->info);
if (data->error)
g_error_free (data->error);
g_free (data);
}
@ -6795,13 +6791,16 @@ set_info_async_thread (GTask *task,
GCancellable *cancellable)
{
SetInfoAsyncData *data = task_data;
GError *error = NULL;
data->error = NULL;
data->res = g_file_set_attributes_from_info (G_FILE (object),
data->info,
data->flags,
cancellable,
&data->error);
if (g_file_set_attributes_from_info (G_FILE (object),
data->info,
data->flags,
cancellable,
&error))
g_task_return_boolean (task, TRUE);
else
g_task_return_error (task, error);
}
static void
@ -6844,10 +6843,7 @@ g_file_real_set_attributes_finish (GFile *file,
if (info)
*info = g_object_ref (data->info);
if (error != NULL && data->error)
*error = g_error_copy (data->error);
return data->res;
return g_task_propagate_boolean (G_TASK (res), error);
}
static void