luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-14 19:48:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/oholy/fast-content-type' into 'master'

Browse Source 
gfile: Fallback to fast-content-type if content-type is not set

See merge request GNOME/glib!1442
This commit is contained in:
Philip Withnall 2020-04-14 15:48:43 +00:00
commit de8708cd95
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/gfile.c
View File

@ -6839,7 +6839,8 @@ g_file_query_default_handler (GFile *file,
g_free (uri_scheme); g_free (uri_scheme);
info = g_file_query_info (file, info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE ","
G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE,
0, 0,
cancellable, cancellable,
error); error);
@ -6849,6 +6850,8 @@ g_file_query_default_handler (GFile *file,
appinfo = NULL; appinfo = NULL;
content_type = g_file_info_get_content_type (info); content_type = g_file_info_get_content_type (info);
if (content_type == NULL)
content_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
if (content_type) if (content_type)
{ {
/* Don't use is_native(), as we want to support fuse paths if available */ /* Don't use is_native(), as we want to support fuse paths if available */
@ -6890,6 +6893,8 @@ query_default_handler_query_info_cb (GObject *object,
} }
content_type = g_file_info_get_content_type (info); content_type = g_file_info_get_content_type (info);
if (content_type == NULL)
content_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
if (content_type) if (content_type)
{ {
char *path; char *path;
@ -6960,7 +6965,8 @@ g_file_query_default_handler_async (GFile *file,
g_free (uri_scheme); g_free (uri_scheme);
g_file_query_info_async (file, g_file_query_info_async (file,
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE ","
G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE,
0, 0,
io_priority, io_priority,
cancellable, cancellable,