luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-31 21:03:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-2185-trash-fix-glib-2-68' into 'glib-2-68'

Browse Source 
Backport !2185 “glocalfile: Fix the global trash dir detection” to glib-2-68

See merge request GNOME/glib!2186
This commit is contained in:
Ondrej Holy 2021-07-12 11:10:23 +00:00
commit 7cce6b5c7f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/glocalfile.c
View File

@ -2068,6 +2068,7 @@ g_local_file_trash (GFile *file,
(global_stat.st_mode & S_ISVTX) != 0) (global_stat.st_mode & S_ISVTX) != 0)
{ {
trashdir = g_build_filename (globaldir, uid_str, NULL); trashdir = g_build_filename (globaldir, uid_str, NULL);
success = TRUE;
if (g_lstat (trashdir, &trash_stat) == 0) if (g_lstat (trashdir, &trash_stat) == 0)
{ {
@ -2077,12 +2078,14 @@ g_local_file_trash (GFile *file,
/* Not a directory or not owned by user, ignore */ /* Not a directory or not owned by user, ignore */
g_free (trashdir); g_free (trashdir);
trashdir = NULL; trashdir = NULL;
success = FALSE;
} }
} }
else if (g_mkdir (trashdir, 0700) == -1) else if (g_mkdir (trashdir, 0700) == -1)
{ {
g_free (trashdir); g_free (trashdir);
trashdir = NULL; trashdir = NULL;
success = FALSE;
} }
} }
g_free (globaldir); g_free (globaldir);