summaryrefslogtreecommitdiff
path: root/src/nautilus-preferences-window.c
diff options
context:
space:
mode:
authorSachin Daluja <30343-sachindaluja@users.noreply.gitlab.gnome.org>2021-01-24 11:54:59 -0500
committerSachin Daluja <30343-sachindaluja@users.noreply.gitlab.gnome.org>2021-02-06 10:43:51 -0500
commite96aac1f6526f5373405e071703b5f18b0c728d3 (patch)
treeaab2c135168c204226123334ee68a07f004e44c8 /src/nautilus-preferences-window.c
parentd2e3decfa35a327a650630910617ad8442587ea7 (diff)
downloadnautilus-e96aac1f6526f5373405e071703b5f18b0c728d3.tar.gz
general: Remove option to bypass delete confirmation
A gsettings-based option "confirm-trash" existed to determine if a confirmation dialog should be shown when emptying the trash. This setting, enabled by default, was misappropriated for the unrelated "delete directly" operation of files outside Trash. This latter use of this setting was misleading and unexpected (more discussion on the linked issue page.) Remove option "confirm-trash" entirely because neither of the above mentioned operations are reversible, so they should always require confirmation. Add ellipsis to labels for the "empty trash" and "delete permanently" actions since they now always invoke a confirmation dialog. Closes https://gitlab.gnome.org/GNOME/nautilus/-/issues/1699
Diffstat (limited to 'src/nautilus-preferences-window.c')
-rw-r--r--src/nautilus-preferences-window.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/nautilus-preferences-window.c b/src/nautilus-preferences-window.c
index d75d9dcfa..b49ee3e9a 100644
--- a/src/nautilus-preferences-window.c
+++ b/src/nautilus-preferences-window.c
@@ -59,8 +59,6 @@
"show_create_link_checkbutton"
#define NAUTILUS_PREFERENCES_DIALOG_LIST_VIEW_USE_TREE_WIDGET \
"use_tree_view_checkbutton"
-#define NAUTILUS_PREFERENCES_DIALOG_TRASH_CONFIRM_WIDGET \
- "trash_confirm_checkbutton"
#define NAUTILUS_PREFERENCES_DIALOG_USE_NEW_VIEWS_WIDGET \
"use_new_views_checkbutton"
@@ -465,9 +463,6 @@ static void nautilus_preferences_window_setup(GtkBuilder *builder,
bind_builder_bool (builder, nautilus_window_state,
NAUTILUS_PREFERENCS_DIALOG_START_WITH_SIDEBAR,
NAUTILUS_WINDOW_STATE_START_WITH_SIDEBAR);
- bind_builder_bool (builder, nautilus_preferences,
- NAUTILUS_PREFERENCES_DIALOG_TRASH_CONFIRM_WIDGET,
- NAUTILUS_PREFERENCES_CONFIRM_TRASH);
bind_builder_bool (builder, nautilus_list_view_preferences,
NAUTILUS_PREFERENCES_DIALOG_LIST_VIEW_USE_TREE_WIDGET,
NAUTILUS_PREFERENCES_LIST_VIEW_USE_TREE);