From d1ffef1388e87c201a422beb459b623702d88b9a Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Fri, 12 Jul 2013 12:14:50 +0200
Subject: ev-window: Remove scroll accelerators

They are handled by the EvView now.
We just leave the page up/down accels, so that they still work
even when the view is not focused.

origin commit (modified):
https://git.gnome.org/browse/evince/commit/?h=gnome-3-10&id=6a7c3db
---
 data/atril-ui.xml |  6 ------
 shell/ev-window.c | 19 -------------------
 2 files changed, 25 deletions(-)

diff --git a/data/atril-ui.xml b/data/atril-ui.xml
index 0dda7b52..182082f3 100644
--- a/data/atril-ui.xml
+++ b/data/atril-ui.xml
@@ -115,14 +115,8 @@
   <accelerator name="EscapeAccel" action="Escape"/>
   <accelerator name="SlashAccel" action="Slash"/>
   <accelerator name="F3Accel" action="F3"/>
-  <accelerator name="SpaceAccel" action="Space"/>
-  <accelerator name="ReturnAccel" action="Return"/>
-  <accelerator name="BackSpaceAccel" action="BackSpace"/>
-  <accelerator name="ShiftSpaceAccel" action="ShiftSpace"/>
-  <accelerator name="ShiftBackSpaceAccel" action="ShiftBackSpace"/>
   <accelerator name="pAccel" action="p"/>
   <accelerator name="nAccel" action="n"/>
-  <accelerator name="ShiftReturnAccel" action="ShiftReturn"/>
   <accelerator name="FocusPageSelectorAccel" action="FocusPageSelector"/>
   <accelerator name="PlusAccel" action="Plus"/>
   <accelerator name="MinusAccel" action="Minus"/>
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 871c5a18..3d3a4d97 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -628,12 +628,6 @@ ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
 	if (window->priv->action_group) {
 		ev_window_set_action_sensitive (window, "PageDown", sensitive);
 		ev_window_set_action_sensitive (window, "PageUp", sensitive);
-		ev_window_set_action_sensitive (window, "Space", sensitive);
-		ev_window_set_action_sensitive (window, "ShiftSpace", sensitive);
-		ev_window_set_action_sensitive (window, "BackSpace", sensitive);
-		ev_window_set_action_sensitive (window, "ShiftBackSpace", sensitive);
-		ev_window_set_action_sensitive (window, "Return", sensitive);
-		ev_window_set_action_sensitive (window, "ShiftReturn", sensitive);
 		ev_window_set_action_sensitive (window, "Plus", sensitive);
 		ev_window_set_action_sensitive (window, "Minus", sensitive);
 		ev_window_set_action_sensitive (window, "KpPlus", sensitive);
@@ -641,7 +635,6 @@ ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)
 		ev_window_set_action_sensitive (window, "Equal", sensitive);
 		ev_window_set_action_sensitive (window, "p", sensitive);
 		ev_window_set_action_sensitive (window, "n", sensitive);
-
 		ev_window_set_action_sensitive (window, "Slash", sensitive && can_find);
 	}
 }
@@ -6276,18 +6269,6 @@ static const GtkActionEntry entries[] = {
           G_CALLBACK (ev_window_cmd_scroll_forward) },
         { "PageUp", NULL, "", "Page_Up", NULL,
           G_CALLBACK (ev_window_cmd_scroll_backward) },
-        { "Space", NULL, "", "space", NULL,
-          G_CALLBACK (ev_window_cmd_scroll_forward) },
-        { "ShiftSpace", NULL, "", "<shift>space", NULL,
-          G_CALLBACK (ev_window_cmd_scroll_backward) },
-        { "BackSpace", NULL, "", "BackSpace", NULL,
-          G_CALLBACK (ev_window_cmd_scroll_backward) },
-        { "ShiftBackSpace", NULL, "", "<shift>BackSpace", NULL,
-          G_CALLBACK (ev_window_cmd_scroll_forward) },
-        { "Return", NULL, "", "Return", NULL,
-          G_CALLBACK (ev_window_cmd_scroll_forward) },
-        { "ShiftReturn", NULL, "", "<shift>Return", NULL,
-          G_CALLBACK (ev_window_cmd_scroll_backward) },
 	{ "p", GTK_STOCK_GO_UP, "", "p", NULL,
 	  G_CALLBACK (ev_window_cmd_go_previous_page) },
 	{ "n", GTK_STOCK_GO_DOWN, "", "n", NULL,
-- 
cgit v1.2.1