Mercurial > geeqie.yaz

changeset 1212:97f30a17dc6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed safe delete
author nadvornik
date Sun, 21 Dec 2008 21:36:58 +0000
parents e2bbe90b0dcd
children bbec86370ef4
files src/filedata.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/filedata.c	Sun Dec 21 21:20:36 2008 +0000
+++ b/src/filedata.c	Sun Dec 21 21:36:58 2008 +0000
@@ -19,6 +19,7 @@
 #include "thumb_standard.h"
 #include "ui_fileops.h"
 #include "metadata.h"
+#include "trash.h"
 
 
 static GHashTable *file_data_pool = NULL;
@@ -1949,7 +1950,10 @@
 	if (isdir(fd->path) && !islink(fd->path))
 		return rmdir_utf8(fd->path);
 	else
-		return unlink_file(fd->path);
+		if (options->file_ops.safe_delete_enable)
+			return file_util_safe_unlink(fd->path);
+		else
+			return unlink_file(fd->path);
 }
 
 gboolean file_data_perform_ci(FileData *fd)