[nautilus] Revert "Revert "Use ctrl-delete as the keyboard shortcut to trash files""

[Cosimo Cecchi <cosimoc src gnome org>]

commit 29a050d986bd5fd86ef522617966768c8c40beb7
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Mar 5 11:38:32 2012 -0500

    Revert "Revert "Use ctrl-delete as the keyboard shortcut to trash files""
    
    Having people randomly commit unapproved controversial changes to the UI
    during UI freeze is so awesome...
    
    This reverts commit 6c21b39cd9d22de4c92ab214e647e65fbfdfe9ac.

 src/nautilus-view.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 31d2258..ab6a24f 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -7044,7 +7044,7 @@ static const GtkActionEntry directory_view_entries[] = {
   /* label, accelerator */       "RenameSelectAll", "<shift>F2",
   /* tooltip */                  NULL,
 				 G_CALLBACK (action_rename_select_all_callback) },
-  /* name, stock id */         { "Trash", NULL,
+  /* name, stock id */         { "Trash", "<control>Delete",
   /* label, accelerator */       N_("Mo_ve to Trash"), NULL,
   /* tooltip */                  N_("Move each selected item to the Trash"),
 				 G_CALLBACK (action_trash_callback) },
@@ -9701,9 +9701,9 @@ nautilus_view_class_init (NautilusViewClass *klass)
 	g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
 
 	binding_set = gtk_binding_set_by_class (klass);
-	gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0,
+	gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK,
 				      "trash", 0);
-	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0,
+	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK,
 				      "trash", 0);
 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK,
 				      "delete", 0);