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

gfile: Make g_query_default_handler_async really Async

Browse Source 
Despite the name, the call was still doing blocking operations when
looking for app handlers via GAppInfo. Now it's possible to use fully
async calls.

Together with previous commit, the API is now fully async.
This commit is contained in:
Marco Trevisan (Treviño) 2022-06-02 00:47:43 +02:00
parent 8a880e1379
commit 5b04d23fc4
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gio/gfile.c
View File

@ -7603,6 +7603,34 @@ query_default_handler_query_info_cb (GObject *object,
g_clear_object (&task);
}
static void
on_query_default_handler_for_uri_cb (GObject *object,
GAsyncResult *result,
gpointer user_data)
{
GTask *task = user_data;
GAppInfo *app_info;
app_info = g_app_info_get_default_for_uri_scheme_finish (result, NULL);
if (app_info)
{
g_task_return_pointer (task, g_steal_pointer (&app_info), g_object_unref);
g_object_unref (task);
}
else
{
g_file_query_info_async (g_task_get_source_object (task),
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE ","
G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE,
0,
g_task_get_priority (task),
g_task_get_cancellable (task),
query_default_handler_query_info_cb,
task);
}
}
/**
* g_file_query_default_handler_async:
* @file: a #GFile to open
@ -7631,21 +7659,13 @@ g_file_query_default_handler_async (GFile *file,
uri_scheme = g_file_get_uri_scheme (file);
if (uri_scheme && uri_scheme[0] != '\0')
{
GAppInfo *appinfo;
/* FIXME: The following still uses blocking calls. */
appinfo = g_app_info_get_default_for_uri_scheme (uri_scheme);
g_app_info_get_default_for_uri_scheme_async (uri_scheme,
cancellable,
on_query_default_handler_for_uri_cb,
g_steal_pointer (&task));
g_free (uri_scheme);
if (appinfo != NULL)
{
g_task_return_pointer (task, g_steal_pointer (&appinfo), g_object_unref);
g_object_unref (task);
return;
}
return;
}
else
g_free (uri_scheme);
g_file_query_info_async (file,
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE ","
@ -7655,6 +7675,8 @@ g_file_query_default_handler_async (GFile *file,
cancellable,
query_default_handler_query_info_cb,
g_steal_pointer (&task));
g_free (uri_scheme);
}
/**