diff options
| -rw-r--r-- | src/nautilus-file-operations.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c index c61c3d9ef..3adf3b54c 100644 --- a/src/nautilus-file-operations.c +++ b/src/nautilus-file-operations.c @@ -7898,6 +7898,15 @@ delete_trash_file (CommonJob *job, if (del_children) { + gboolean should_recurse; + + /* The g_file_delete operation works differently for locations provided + * by the trash backend as it prevents modifications of trashed items + * For that reason, it is enough to call g_file_delete on top-level + * items only. + */ + should_recurse = !g_file_has_uri_scheme (file, "trash"); + enumerator = g_file_enumerate_children (file, G_FILE_ATTRIBUTE_STANDARD_NAME "," G_FILE_ATTRIBUTE_STANDARD_TYPE, @@ -7909,10 +7918,13 @@ delete_trash_file (CommonJob *job, while (!job_aborted (job) && (info = g_file_enumerator_next_file (enumerator, job->cancellable, NULL)) != NULL) { + gboolean is_dir; + child = g_file_get_child (file, g_file_info_get_name (info)); - delete_trash_file (job, child, TRUE, - g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY); + is_dir = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY); + + delete_trash_file (job, child, TRUE, should_recurse && is_dir); g_object_unref (child); g_object_unref (info); } |