nautilus-view: always allow to permanently delete

Before 3.15 we had a setting for adding a menu item for permanent
deletion of files. But the shortcut was always enabled no matter the
state of the setting, which seems inconsistent.

Then with the GAction port we changed that behavior to be consistent,
but people that were unaware of the setting were complaining that
the shortcut for permanent deletion was not working.

Given that we show a dialog if we hit that shortcut, and the setting
itself is confusing, just enable always the shortcut but remove the
setting and the menu item for it.

https://bugzilla.gnome.org/show_bug.cgi?id=745321

1 files changed, 1 insertions, 7 deletions

diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 70c99d86b..1faba7446 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -6014,11 +6014,8 @@ real_update_actions_state (NautilusView *view)
 
 	action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group),
 					     "delete-permanently");
-	/* Only show it in trash folder or if the setting to include a delete
-	 * menu item is enabled */
-	show_separate_delete_command = g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_ENABLE_DELETE);
 	g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
-				     can_delete_files && show_separate_delete_command);
+				     can_delete_files);
 
 	action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group),
 					     "cut");
@@ -7530,9 +7527,6 @@ nautilus_view_init (NautilusView *view)
 	gtk_widget_show (GTK_WIDGET (view));
 
 	g_signal_connect_swapped (nautilus_preferences,
-				  "changed::" NAUTILUS_PREFERENCES_ENABLE_DELETE,
-				  G_CALLBACK (schedule_update_context_menus), view);
-	g_signal_connect_swapped (nautilus_preferences,
 				  "changed::" NAUTILUS_PREFERENCES_CLICK_POLICY,
 				  G_CALLBACK (click_policy_changed_callback),
 				  view);