summaryrefslogtreecommitdiff
path: root/src/file-manager
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2017-09-23 20:28:05 +0200
committermonsta <[email protected]>2017-11-01 14:32:45 +0300
commit6ccc50855059b7fd7551b1df94cc4acc1df0c4bc (patch)
tree23d90d311e9fb13419933b2d3b3354d2fa5c1730 /src/file-manager
parent343bcfe83b307e9fa5365c9337f62263d021046d (diff)
downloadcaja-6ccc50855059b7fd7551b1df94cc4acc1df0c4bc.tar.bz2
caja-6ccc50855059b7fd7551b1df94cc4acc1df0c4bc.tar.xz
Fix: wrong <Shift+Del> behavior while renaming files
Fixes https://github.com/mate-desktop/caja/issues/509
Diffstat (limited to 'src/file-manager')
-rw-r--r--src/file-manager/fm-directory-view.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 16a53780..3bb6bd23 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1063,7 +1063,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);
@@ -7368,7 +7368,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"), "<shift>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,
@@ -11074,6 +11074,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);