From bc3edaa0b25d3233262f357545bd77eaadb41d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= Date: Sat, 24 Jul 2021 20:00:14 +0100 Subject: file-conflict-dialog: Don't change action when unchecking The "Apply this action to all files and folders" checkbox works only with the "Replace" action, not the "Rename" action. Indeed, if the rename field is expanded, the checkbox is greyed out. However, if the checkbox is checked, when unchecking it changes the main action to Rename, despite the rename field being obviously hidden (otherwise the checkbox wouldn't be checked). That's wrong. It's a regression from 15d59cd18de13b1c09dae1fe07102e213cdd9fd4 When the checkbox is unchecked, the action is already "Replace", so there is no need to change it. Fixes https://gitlab.gnome.org/GNOME/nautilus/-/issues/1889 --- src/nautilus-file-conflict-dialog.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/nautilus-file-conflict-dialog.c b/src/nautilus-file-conflict-dialog.c index 678f96323..77753af87 100644 --- a/src/nautilus-file-conflict-dialog.c +++ b/src/nautilus-file-conflict-dialog.c @@ -253,17 +253,6 @@ checkbox_toggled_cb (GtkToggleButton *t, NautilusFileConflictDialog *dialog) { gtk_widget_set_sensitive (dialog->expander, !gtk_toggle_button_get_active (t)); - - if (!gtk_toggle_button_get_active (t)) - { - gtk_widget_hide (dialog->replace_button); - gtk_widget_show (dialog->rename_button); - } - else - { - gtk_widget_hide (dialog->rename_button); - gtk_widget_show (dialog->replace_button); - } } static void -- cgit v1.2.1