From: Colin Clark <colin.clark@cclark.uk>
Date: Wed, 24 Jan 2024 17:01:05 +0000 (+0000)
Subject: Fix #1223: "Confirm move files to trash" not working
X-Git-Tag: v2.2~3
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=3738cb1c6f36525063c5eb87d5fb1a83aaee11c3

Fix #1223: "Confirm move files to trash" not working

https://github.com/BestImageViewer/geeqie/issues/1223

Check for move to trash missing.
---

diff --git a/src/utilops.cc b/src/utilops.cc
index f7bb3166..76bcea91 100644
--- a/src/utilops.cc
+++ b/src/utilops.cc
@@ -3049,7 +3049,14 @@ static gboolean file_util_write_metadata_first(UtilityType type, UtilityPhase ph
 
 void file_util_delete(FileData *source_fd, GList *source_list, GtkWidget *parent)
 {
-	file_util_delete_full(source_fd, source_list, parent, options->file_ops.confirm_delete ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING, nullptr, nullptr);
+	if (options->file_ops.safe_delete_enable == FALSE)
+		{
+		file_util_delete_full(source_fd, source_list, parent, options->file_ops.confirm_delete ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING, nullptr, nullptr);
+		}
+	else
+		{
+		file_util_delete_full(source_fd, source_list, parent, options->file_ops.confirm_move_to_trash ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING, nullptr, nullptr);
+		}
 }
 
 void file_util_delete_notify_done(FileData *source_fd, GList *source_list, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data)