From e3c0b427bb5f6d29122abcedc894d311d989715b Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Sat, 23 Sep 2017 20:28:05 +0200 Subject: Fix: wrong behavior while renaming files Fixes https://github.com/mate-desktop/caja/issues/509 --- src/file-manager/fm-directory-view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 99996801..a4eeb2c4 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -1064,7 +1064,7 @@ real_delete (FMDirectoryView *view) GtkAction *action; action = gtk_action_group_get_action (view->details->dir_action_group, - FM_ACTION_DELETE); + FM_ACTION_TRASH); if (gtk_action_get_sensitive (action) && gtk_action_get_visible (action)) { delete_selected_files (view); @@ -7366,7 +7366,7 @@ static const GtkActionEntry directory_view_entries[] = { /* tooltip */ N_("Move each selected item to the Trash"), G_CALLBACK (action_trash_callback) }, /* name, stock id */ { "Delete", NULL, - /* label, accelerator */ N_("_Delete"), "Delete", + /* label, accelerator */ N_("_Delete"), NULL, /* tooltip */ N_("Delete each selected item, without moving to the Trash"), G_CALLBACK (action_delete_callback) }, /* name, stock id */ { "Restore From Trash", NULL, @@ -11072,6 +11072,8 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass) "trash", 0); gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0, "trash", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK, + "delete", 0); gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK, "delete", 0); -- cgit v1.2.1