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

Merge branch 'win32_file_trash_user_cancelled' into 'main'

Browse Source 
glocalfile: Fix trash user cancellation not reported on Windows

See merge request GNOME/glib!4909
This commit is contained in:
Philip Withnall
2025-11-19 14:30:41 +00:00
parent a0631ca294 373fd1079a
commit b71e443f38
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gio/glocalfile.c
View File

@@ -99,6 +99,9 @@
#ifndef ECANCELED
#define ECANCELED 105
#endif
#ifndef ERROR_CANCELLED
#define ERROR_CANCELLED 1223
#endif
#endif
@@ -2553,6 +2556,7 @@ g_local_file_trash (GFile *file,
gboolean success;
wchar_t *wfilename;
long len;
int errcode;
wfilename = g_utf8_to_utf16 (local->filename, -1, NULL, &len, NULL);
/* SHFILEOPSTRUCT.pFrom is double-zero-terminated */
@@ -2563,9 +2567,10 @@ g_local_file_trash (GFile *file,
op.pFrom = wfilename;
op.fFlags = FOF_ALLOWUNDO;
success = SHFileOperationW (&op) == 0;
errcode = SHFileOperationW (&op);
success = errcode == 0;
if (success && op.fAnyOperationsAborted)
if ((success || errcode == ERROR_CANCELLED) && op.fAnyOperationsAborted)
{
if (cancellable && !g_cancellable_is_cancelled (cancellable))
g_cancellable_cancel (cancellable);