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

Merge branch 'wip/oholy/peek-path-fixes' into 'master'

Browse Source 
gfile: Do not return target-uri from g_file_peek_path()

See merge request GNOME/glib!1346
This commit is contained in:
Philip Withnall 2020-02-03 11:47:21 +00:00
commit 260cff0e5f
1 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gio/gfile.c
View File

@ -534,37 +534,6 @@ g_file_get_path (GFile *file)
return (* iface->get_path) (file); return (* iface->get_path) (file);
} }
/* Original commit introducing this in libgsystem:
*
* fileutil: Handle recent: and trash: URIs
*
* The gs_file_get_path_cached() was rather brittle in its handling
* of URIs. It would assert() when a GFile didn't have a backing path
* (such as when handling trash: or recent: URIs), and didn't know
* how to get the target URI for those items either.
*
* Make sure that we do not assert() when a backing path cannot be
* found, and handle recent: and trash: URIs.
*
* https://bugzilla.gnome.org/show_bug.cgi?id=708435
*/
static char *
file_get_target_path (GFile *file)
{
GFileInfo *info;
const char *target;
char *path;
info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI, G_FILE_QUERY_INFO_NONE, NULL, NULL);
if (info == NULL)
return NULL;
target = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
path = g_filename_from_uri (target, NULL, NULL);
g_object_unref (info);
return path;
}
static const char * static const char *
file_peek_path_generic (GFile *file) file_peek_path_generic (GFile *file)
{ {
@ -591,10 +560,6 @@ file_peek_path_generic (GFile *file)
if (path != NULL) if (path != NULL)
break; break;
if (g_file_has_uri_scheme (file, "trash") ||
g_file_has_uri_scheme (file, "recent"))
new_path = file_get_target_path (file);
else
new_path = g_file_get_path (file); new_path = g_file_get_path (file);
if (new_path == NULL) if (new_path == NULL)
return NULL; return NULL;
@ -603,7 +568,10 @@ file_peek_path_generic (GFile *file)
if (g_object_replace_qdata ((GObject *) file, _file_path_quark, if (g_object_replace_qdata ((GObject *) file, _file_path_quark,
NULL, (gpointer) new_path, NULL, (gpointer) new_path,
(GDestroyNotify) g_free, NULL)) (GDestroyNotify) g_free, NULL))
{
path = new_path;
break; break;
}
else else
g_free (new_path); g_free (new_path);
} }