[nautilus] Remove switch to other pane menu item and make F6 do this instead

[Alexander Larsson <alexl src gnome org>]

commit 3fb63af8aed0f350f4eabf65085d80a4442a34b5
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Dec 17 15:45:00 2009 +0100

    Remove switch to other pane menu item and make F6 do this instead
    
    This is a very useless menu item, its sole reason for existance is
    to bind a keyboard combo to it. Instead we should just choose one.
    
    Some research indicate that F6 is standard for this. In Gtk+ F6 is
    used for split view navigation in general, so it will toggle between the
    sidebar and the two views. However, you can reach the sidebar in other
    ways using keynav, and the more important thing is the pane toggling,
    so we override this and make F6 be pane switching only.

 src/nautilus-navigation-window-menus.c |    4 ++--
 src/nautilus-navigation-window-ui.xml  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 1b083db..15ec94b 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -557,7 +557,7 @@ nautilus_navigation_window_update_split_view_actions_sensitivity (NautilusNaviga
 		next_pane_is_in_same_location = FALSE;
 	}
 
-    /* switch to next pane */
+	/* switch to next pane */
 	action = gtk_action_group_get_action (action_group, "SplitViewNextPane");
 	gtk_action_set_sensitive (action, have_multiple_panes);
 
@@ -1012,7 +1012,7 @@ static const GtkActionEntry navigation_entries[] = {
                                  NULL, N_("Clear contents of Go menu and Back/Forward lists"),
                                  G_CALLBACK (action_clear_history_callback) },
   /* name, stock id, label */  { "SplitViewNextPane", NULL, N_("Switch to other pane"),
-				 NULL, N_("Move focus to the other pane in a split view window"),
+				 "F6", N_("Move focus to the other pane in a split view window"),
 				 G_CALLBACK (action_split_view_switch_next_pane_callback) },                                 
   /* name, stock id, label */  { "SplitViewSameLocation", NULL, N_("Go to same location as other pane"),
 				 NULL, N_("Go to the same location in the other pane of a split view window"),
diff --git a/src/nautilus-navigation-window-ui.xml b/src/nautilus-navigation-window-ui.xml
index 23c46ae..bdb6350 100644
--- a/src/nautilus-navigation-window-ui.xml
+++ b/src/nautilus-navigation-window-ui.xml
@@ -1,5 +1,6 @@
 <ui>
 <accelerator action="ShowSearch"/>
+<accelerator naction="SplitViewNextPane"/>
 <menubar name="MenuBar">
 	<menu action="File">
 		<placeholder name="New Items Placeholder">
@@ -40,7 +41,6 @@
 			<separator/>
 			<menuitem name="Clear History" action="Clear History"/>
 			<separator/>
-            <menuitem name="SplitViewNextPaneMenu" action="SplitViewNextPane"/>
             <menuitem name="SplitViewSameLocationMenu" action="SplitViewSameLocation"/>
             <separator/>
 			<placeholder name="History Placeholder"/>