From b97f085565bac06d90a8577c3e3b9c2969ab3456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastien=20No=C3=ABl?= <sebastien@twolife.be>
Date: Tue, 28 Jan 2014 14:08:31 -0500
Subject: [PATCH] Restore backspace for going to parent folder

This restores the behaviour from nautilus <= 3.4.
---
 src/nautilus-list-view.c    |  5 +++++
 src/nautilus-query-editor.c |  2 +-
 src/nautilus-shell-ui.xml   |  1 +
 src/nautilus-window-menus.c | 11 +++++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index e428e70..f63251f 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -1903,6 +1903,7 @@ create_and_set_up_tree_view (NautilusListView *view)
 {
 	GtkCellRenderer *cell;
 	GtkTreeViewColumn *column;
+	GtkBindingSet *binding_set;
 	AtkObject *atk_obj;
 	GList *nautilus_columns;
 	GList *l;
@@ -1915,6 +1916,10 @@ create_and_set_up_tree_view (NautilusListView *view)
 							NULL);
 	gtk_tree_view_set_enable_search (view->details->tree_view, FALSE);
 
+	/* Don't handle backspace key. It's used to open the parent folder. */
+	binding_set = gtk_binding_set_by_class (GTK_WIDGET_GET_CLASS (view->details->tree_view));
+	gtk_binding_entry_remove (binding_set, GDK_KEY_BackSpace, 0);
+
 	view->details->drag_dest = 
 		nautilus_tree_view_drag_dest_new (view->details->tree_view);
 
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 92ddac7..989d28b 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -123,7 +123,7 @@ nautilus_query_editor_handle_event (NautilusQueryEditor *editor,
 	}
 
 	/* never handle these events */
-	if (event->keyval == GDK_KEY_slash || event->keyval == GDK_KEY_Delete) {
+	if (event->keyval == GDK_KEY_slash || event->keyval == GDK_KEY_Delete || event->keyval == GDK_KEY_BackSpace) {
 		return FALSE;
 	}
 
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 53f8022..b6ef7e0 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -16,6 +16,7 @@
 <accelerator action="PromptLocationSlashAccel"/>
 <accelerator action="PromptLocationTildeAccel"/>
 <accelerator action="ReloadAccel"/>
+<accelerator action="GoUpAccel"/>
 <popup name="ViewMenu" accelerators="true">
   <placeholder name="Zoom Items Placeholder">
     <menuitem name="Zoom In" action="Zoom In"/>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index ae14fc2..b8189ac 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -448,6 +448,13 @@ action_prompt_for_location_tilde_callback (GtkAction *action,
 }
 
 static void
+action_window_go_up_callback (GtkAction *action,
+				     NautilusWindow *window)
+{
+	nautilus_window_slot_go_up (nautilus_window_get_active_slot (window), 0);
+}
+
+static void
 action_view_radio_changed (GtkRadioAction *action,
 			   GtkRadioAction *current,
 			   NautilusWindow *window)
@@ -491,6 +498,10 @@ static const GtkActionEntry main_entries[] = {
   /* label, accelerator */       "ReloadAccel", "F5",
   /* tooltip */                  NULL,
                                  G_CALLBACK (action_reload_callback) },
+  /* name, stock id */         { "GoUpAccel", NULL,
+  /* label, accelerator */       "GoUpAccel", "BackSpace",
+  /* tooltip */                  NULL,
+                                 G_CALLBACK (action_window_go_up_callback) },
   /* name, stock id */         { NAUTILUS_ACTION_HELP, NULL,
   /* label, accelerator */       N_("_All Topics"), "F1",
   /* tooltip */                  N_("Display Nautilus help"),
-- 
1.8.5.3