diff options
| author | Corey Berla <corey@berla.me> | 2022-12-28 09:39:28 -0800 |
|---|---|---|
| committer | António Fernandes <antoniof@gnome.org> | 2023-01-09 13:44:00 +0000 |
| commit | 8e49b50c60f81938ba1999323dc9c53e76c32757 (patch) | |
| tree | cf7370fbe1e3104122b0113f8ce39a385ee24af0 | |
| parent | 999782552986837b063f8f5e95bfd05fef0ddc46 (diff) | |
| download | nautilus-8e49b50c60f81938ba1999323dc9c53e76c32757.tar.gz | |
files-view: Use clipboard_clear_if_colliding_uris consistently
We only call clipboard_clear_if_colliding_uris() from a dnd operation.
Previous to the gtk4 port, this was called from the
canvas view 2d1deaac2dd12b0ba16446bfbf3498b266e60338
and tree view 6708861ed174e2b2423df0500df9987cdaf2adc0
Also, we are calling nautilus_clipboard_clear_if_colliding_uris()
for any copy/move operation. Copy/Link don't negatively impact the
clipboard, so lets just call this on GDK_ACTION_MOVE
| -rw-r--r-- | src/nautilus-files-view-dnd.c | 3 | ||||
| -rw-r--r-- | src/nautilus-files-view.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/nautilus-files-view-dnd.c b/src/nautilus-files-view-dnd.c index f694ca2ee..f6e334b81 100644 --- a/src/nautilus-files-view-dnd.c +++ b/src/nautilus-files-view-dnd.c @@ -195,9 +195,6 @@ nautilus_files_view_drop_proxy_received_uris (NautilusFilesView *view, return; } - nautilus_clipboard_clear_if_colliding_uris (GTK_WIDGET (view), - source_uri_list); - nautilus_files_view_move_copy_items (view, source_uri_list, target_uri != NULL ? target_uri : container_uri, action); diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index 5f55c496d..047e71aa1 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -9059,6 +9059,11 @@ nautilus_files_view_move_copy_items (NautilusFilesView *view, return; } + else if (copy_action == GDK_ACTION_MOVE) + { + nautilus_clipboard_clear_if_colliding_uris (GTK_WIDGET (view), + item_uris); + } nautilus_file_unref (target_file); nautilus_file_operations_copy_move |