luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-27 14:32:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

GLocalFile: keep suffix name when trashing

Browse Source 
Keeping the suffix name makes it easier to get the correct content-type.
This commit is contained in:
wangrong
2025-09-26 14:34:16 +08:00
parent 2015c9b2f8
commit 05012cd1c4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/glocalfile.c
View File

@@ -2360,6 +2360,7 @@ g_local_file_trash (GFile *file,
if (basename_len <= strlen (".trashinfo")) if (basename_len <= strlen (".trashinfo"))
break; /* fail with ENAMETOOLONG */ break; /* fail with ENAMETOOLONG */
basename_len -= strlen (".trashinfo"); basename_len -= strlen (".trashinfo");
memmove (basename, basename + strlen (".trashinfo"), basename_len);
basename[basename_len] = '\0'; basename[basename_len] = '\0';
i = 1; i = 1;
continue; continue;
@@ -2383,6 +2384,7 @@ g_local_file_trash (GFile *file,
if (basename_len <= strlen (".XXXXXX")) if (basename_len <= strlen (".XXXXXX"))
break; /* fail with ENAMETOOLONG */ break; /* fail with ENAMETOOLONG */
basename_len -= strlen (".XXXXXX"); basename_len -= strlen (".XXXXXX");
memmove (basename, basename + strlen (".XXXXXX"), basename_len);
basename[basename_len] = '\0'; basename[basename_len] = '\0';
i = 1; i = 1;
g_clear_error (&my_error); g_clear_error (&my_error);