From da471facf7226d73f570e1d682f18b0ace4868b7 Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ernestask@gnome.org>
Date: Tue, 13 Jun 2017 18:33:13 +0300
Subject: Revert "files-view: Add alternative shortcut for renaming files"

This reverts commit 3c00fa343ec5b642846bc4c280cec7bb18a299a3.
---
 src/nautilus-files-view.c         | 8 +-------
 src/resources/gtk/help-overlay.ui | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index b73ebbcdd..1874d8b11 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -9489,12 +9489,6 @@ nautilus_files_view_init (NautilusFilesView *view)
         "<control>plus",
         NULL
     };
-    const gchar *rename_shortcuts[] =
-    {
-        "<control>m",
-        "F2",
-        NULL
-    };
 
     nautilus_profile_start (NULL);
 
@@ -9694,7 +9688,7 @@ nautilus_files_view_init (NautilusFilesView *view)
     nautilus_application_set_accelerator (app, "view.permanent-delete-permanently-menu-item", "<shift>Delete");
     nautilus_application_set_accelerators (app, "view.properties", open_properties);
     nautilus_application_set_accelerator (app, "view.open-item-location", "<control><alt>o");
-    nautilus_application_set_accelerators (app, "view.rename", rename_shortcuts);
+    nautilus_application_set_accelerator (app, "view.rename", "F2");
     nautilus_application_set_accelerator (app, "view.cut", "<control>x");
     nautilus_application_set_accelerator (app, "view.copy", "<control>c");
     nautilus_application_set_accelerator (app, "view.create-link-in-place", "<control><shift>m");
diff --git a/src/resources/gtk/help-overlay.ui b/src/resources/gtk/help-overlay.ui
index 32f7ccd30..7cf7a1b6a 100644
--- a/src/resources/gtk/help-overlay.ui
+++ b/src/resources/gtk/help-overlay.ui
@@ -304,7 +304,7 @@
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
                 <property name="title" translatable="yes" context="shortcut window">Rename</property>
-                <property name="accelerator">F2 &lt;Primary&gt;M</property>
+                <property name="accelerator">F2</property>
               </object>
             </child>
             <child>
-- 
cgit v1.2.1