diff options
| author | Peter Eisenmann <650-p3732@users.noreply.gitlab.gnome.org> | 2023-01-08 16:42:25 +0000 |
|---|---|---|
| committer | António Fernandes <antoniof@gnome.org> | 2023-01-08 16:42:25 +0000 |
| commit | 11dea19756b47af160e396fb16c280d1b6ccc997 (patch) | |
| tree | 1a01b64fcc7ae0458a0806d0d9817876dbf59794 /src/nautilus-file-operations.c | |
| parent | 1bde3cac68e37699f411100963e0a9fb0d3d93a7 (diff) | |
| download | nautilus-11dea19756b47af160e396fb16c280d1b6ccc997.tar.gz | |
file-conflict-dialog: change base to AdwWindow
Use AdwWindow as a base class for the conflict dialog, as GtkDialog is
deprecated with GTK 4.10.
Diffstat (limited to 'src/nautilus-file-operations.c')
| -rw-r--r-- | src/nautilus-file-operations.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c index 9c969ce0f..7d364ab6c 100644 --- a/src/nautilus-file-operations.c +++ b/src/nautilus-file-operations.c @@ -53,6 +53,7 @@ #include "nautilus-error-reporting.h" #include "nautilus-operations-ui-manager.h" #include "nautilus-file-changes-queue.h" +#include "nautilus-file-conflict-dialog.h" #include "nautilus-file-private.h" #include "nautilus-tag-manager.h" #include "nautilus-trash-monitor.h" @@ -5675,8 +5676,7 @@ retry: response = handle_copy_move_conflict (job, src, dest, dest_dir); - if (response->id == GTK_RESPONSE_CANCEL || - response->id == GTK_RESPONSE_DELETE_EVENT) + if (response->id == CONFLICT_RESPONSE_CANCEL) { file_conflict_response_free (response); abort_job (job); @@ -6425,8 +6425,7 @@ retry: response = handle_copy_move_conflict (job, src, dest, dest_dir); - if (response->id == GTK_RESPONSE_CANCEL || - response->id == GTK_RESPONSE_DELETE_EVENT) + if (response->id == CONFLICT_RESPONSE_CANCEL) { file_conflict_response_free (response); abort_job (job); |