diff options
| author | Alexandru Fazakas <alex.fazakas97@gmail.com> | 2018-06-27 20:33:34 +0300 |
|---|---|---|
| committer | Alexandru Fazakas <alex.fazakas97@gmail.com> | 2018-07-20 16:58:37 +0300 |
| commit | a54c98973f4cf96e336e9c1e5e61ff6da749ff44 (patch) | |
| tree | abe3c14763f30507dd222e63d5c36acf5bc0f826 /src/nautilus-file-undo-operations.c | |
| parent | 2727c82900a71316328e52cb407d467fc0a58887 (diff) | |
| download | nautilus-a54c98973f4cf96e336e9c1e5e61ff6da749ff44.tar.gz | |
test: Add trash-or-delete test
This patch adds trash_or_delete synchronous alternative and a test
including both of these functionalities.
Diffstat (limited to 'src/nautilus-file-undo-operations.c')
| -rw-r--r-- | src/nautilus-file-undo-operations.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/nautilus-file-undo-operations.c b/src/nautilus-file-undo-operations.c index 26a87edd3..eb9c57e4a 100644 --- a/src/nautilus-file-undo-operations.c +++ b/src/nautilus-file-undo-operations.c @@ -613,10 +613,10 @@ static void ext_restore_undo_func (NautilusFileUndoInfoExt *self, GtkWindow *parent_window) { - nautilus_file_operations_trash_or_delete (g_queue_peek_head_link (self->priv->destinations), - parent_window, - file_undo_info_delete_callback, - self); + nautilus_file_operations_trash_or_delete_async (g_queue_peek_head_link (self->priv->destinations), + parent_window, + file_undo_info_delete_callback, + self); } @@ -640,8 +640,8 @@ ext_copy_duplicate_undo_func (NautilusFileUndoInfoExt *self, files = g_list_copy (g_queue_peek_head_link (self->priv->destinations)); files = g_list_reverse (files); /* Deleting must be done in reverse */ - nautilus_file_operations_delete (files, parent_window, - file_undo_info_delete_callback, self); + nautilus_file_operations_delete_async (files, parent_window, + file_undo_info_delete_callback, self); g_list_free (files); } @@ -901,8 +901,8 @@ create_undo_func (NautilusFileUndoInfo *info, GList *files = NULL; files = g_list_append (files, g_object_ref (self->priv->target_file)); - nautilus_file_operations_delete (files, parent_window, - file_undo_info_delete_callback, self); + nautilus_file_operations_delete_async (files, parent_window, + file_undo_info_delete_callback, self); g_list_free_full (files, g_object_unref); } @@ -1633,8 +1633,8 @@ trash_redo_func (NautilusFileUndoInfo *info, GList *locations; locations = g_hash_table_get_keys (self->priv->trashed); - nautilus_file_operations_trash_or_delete (locations, parent_window, - trash_redo_func_callback, self); + nautilus_file_operations_trash_or_delete_async (locations, parent_window, + trash_redo_func_callback, self); g_list_free (locations); } @@ -2356,8 +2356,8 @@ extract_undo_func (NautilusFileUndoInfo *info, { NautilusFileUndoInfoExtract *self = NAUTILUS_FILE_UNDO_INFO_EXTRACT (info); - nautilus_file_operations_delete (self->priv->outputs, parent_window, - file_undo_info_delete_callback, self); + nautilus_file_operations_delete_async (self->priv->outputs, parent_window, + file_undo_info_delete_callback, self); } static void @@ -2519,8 +2519,8 @@ compress_undo_func (NautilusFileUndoInfo *info, files = g_list_prepend (files, self->priv->output); - nautilus_file_operations_delete (files, parent_window, - file_undo_info_delete_callback, self); + nautilus_file_operations_delete_async (files, parent_window, + file_undo_info_delete_callback, self); g_list_free (files); } |