Evince

Merge lp:~larsu/evince/lp1290104 into lp:~ubuntu-desktop/evince/ubuntu

  1. lp1290104
  2. Merge into ubuntu
Proposed by Lars Karlitski
Status: Merged
Merged at revision: 240
Proposed branch: lp:~larsu/evince/lp1290104
Merge into: lp:~ubuntu-desktop/evince/ubuntu
Diff against target: 319 lines (+119/-37)
3 files modified
debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch (+37/-37)
debian/patches/add-secondary-and-tertiary-keybindings.patch (+81/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~larsu/evince/lp1290104
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+210445@code.launchpad.net

Commit message

Add add-secondary-and-tertiary-keybindings.patch

Description of the change

Add add-secondary-and-tertiary-keybindings.patch

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch'
--- debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch 2014-03-11 14:05:02 +0000
+++ debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch 2014-03-11 16:19:47 +0000
@@ -30,8 +30,8 @@
3030
31Index: evince-3.10.3/shell/Makefile.am31Index: evince-3.10.3/shell/Makefile.am
32===================================================================32===================================================================
33--- evince-3.10.3.orig/shell/Makefile.am 2014-03-11 15:02:44.713138815 +010033--- evince-3.10.3.orig/shell/Makefile.am 2014-03-11 17:15:56.533258733 +0100
34+++ evince-3.10.3/shell/Makefile.am 2014-03-11 15:02:44.697138814 +010034+++ evince-3.10.3/shell/Makefile.am 2014-03-11 17:15:56.517258733 +0100
35@@ -75,6 +75,8 @@35@@ -75,6 +75,8 @@
36 ev-sidebar-page.h \36 ev-sidebar-page.h \
37 ev-sidebar-thumbnails.c \37 ev-sidebar-thumbnails.c \
@@ -59,8 +59,8 @@
59 $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate-source --c-name ev $<59 $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate-source --c-name ev $<
60Index: evince-3.10.3/shell/ev-application.c60Index: evince-3.10.3/shell/ev-application.c
61===================================================================61===================================================================
62--- evince-3.10.3.orig/shell/ev-application.c 2014-03-11 15:02:44.713138815 +010062--- evince-3.10.3.orig/shell/ev-application.c 2014-03-11 17:15:56.533258733 +0100
63+++ evince-3.10.3/shell/ev-application.c 2014-03-11 15:04:05.000000000 +010063+++ evince-3.10.3/shell/ev-application.c 2014-03-11 17:16:13.333258985 +0100
64@@ -42,6 +42,9 @@64@@ -42,6 +42,9 @@
65 #include "ev-application.h"65 #include "ev-application.h"
66 #include "ev-file-helpers.h"66 #include "ev-file-helpers.h"
@@ -174,8 +174,8 @@
174+ "win.select-page", "<Ctrl>L", NULL,174+ "win.select-page", "<Ctrl>L", NULL,
175+ "win.go-backward", "<Shift>Page_Up", NULL,175+ "win.go-backward", "<Shift>Page_Up", NULL,
176+ "win.go-forward", "<Shift>Page_Down", NULL,176+ "win.go-forward", "<Shift>Page_Down", NULL,
177+ "win.go-next-page", "n", NULL,177+ "win.go-next-page", "<Ctrl>Page_Down", "n", NULL,
178+ "win.go-previous-page", "p", NULL,178+ "win.go-previous-page", "<Ctrl>Page_Up", "p", NULL,
179+ "win.sizing-mode::fit-page", "f", NULL,179+ "win.sizing-mode::fit-page", "f", NULL,
180+ "win.sizing-mode::fit-width", "w", NULL,180+ "win.sizing-mode::fit-width", "w", NULL,
181+ "win.open-menu", "F10", NULL,181+ "win.open-menu", "F10", NULL,
@@ -447,8 +447,8 @@
447+}447+}
448Index: evince-3.10.3/shell/ev-application.h448Index: evince-3.10.3/shell/ev-application.h
449===================================================================449===================================================================
450--- evince-3.10.3.orig/shell/ev-application.h 2014-03-11 15:02:44.713138815 +0100450--- evince-3.10.3.orig/shell/ev-application.h 2014-03-11 17:15:56.533258733 +0100
451+++ evince-3.10.3/shell/ev-application.h 2014-03-11 15:02:44.697138814 +0100451+++ evince-3.10.3/shell/ev-application.h 2014-03-11 17:15:56.521258733 +0100
452@@ -81,6 +81,14 @@452@@ -81,6 +81,14 @@
453 GdkScreen *screen,453 GdkScreen *screen,
454 const char *topic);454 const char *topic);
@@ -466,8 +466,8 @@
466 #endif /* !EV_APPLICATION_H */466 #endif /* !EV_APPLICATION_H */
467Index: evince-3.10.3/shell/ev-bookmarks.c467Index: evince-3.10.3/shell/ev-bookmarks.c
468===================================================================468===================================================================
469--- evince-3.10.3.orig/shell/ev-bookmarks.c 2014-03-11 15:02:44.713138815 +0100469--- evince-3.10.3.orig/shell/ev-bookmarks.c 2014-03-11 17:15:56.533258733 +0100
470+++ evince-3.10.3/shell/ev-bookmarks.c 2014-03-11 15:02:44.701138814 +0100470+++ evince-3.10.3/shell/ev-bookmarks.c 2014-03-11 17:15:56.521258733 +0100
471@@ -224,6 +224,14 @@471@@ -224,6 +224,14 @@
472 return g_list_copy (bookmarks->items);472 return g_list_copy (bookmarks->items);
473 }473 }
@@ -485,8 +485,8 @@
485 EvBookmark *bookmark)485 EvBookmark *bookmark)
486Index: evince-3.10.3/shell/ev-bookmarks.h486Index: evince-3.10.3/shell/ev-bookmarks.h
487===================================================================487===================================================================
488--- evince-3.10.3.orig/shell/ev-bookmarks.h 2014-03-11 15:02:44.713138815 +0100488--- evince-3.10.3.orig/shell/ev-bookmarks.h 2014-03-11 17:15:56.533258733 +0100
489+++ evince-3.10.3/shell/ev-bookmarks.h 2014-03-11 15:02:44.701138814 +0100489+++ evince-3.10.3/shell/ev-bookmarks.h 2014-03-11 17:15:56.521258733 +0100
490@@ -43,6 +43,7 @@490@@ -43,6 +43,7 @@
491 GType ev_bookmarks_get_type (void) G_GNUC_CONST;491 GType ev_bookmarks_get_type (void) G_GNUC_CONST;
492 EvBookmarks *ev_bookmarks_new (EvMetadata *metadata);492 EvBookmarks *ev_bookmarks_new (EvMetadata *metadata);
@@ -498,7 +498,7 @@
498Index: evince-3.10.3/shell/ev-recent-menu-model.c498Index: evince-3.10.3/shell/ev-recent-menu-model.c
499===================================================================499===================================================================
500--- /dev/null 1970-01-01 00:00:00.000000000 +0000500--- /dev/null 1970-01-01 00:00:00.000000000 +0000
501+++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-03-11 15:02:44.701138814 +0100501+++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-03-11 17:15:56.521258733 +0100
502@@ -0,0 +1,108 @@502@@ -0,0 +1,108 @@
503+/*503+/*
504+ * Copyright 2014 Canonical Ltd504+ * Copyright 2014 Canonical Ltd
@@ -611,7 +611,7 @@
611Index: evince-3.10.3/shell/ev-recent-menu-model.h611Index: evince-3.10.3/shell/ev-recent-menu-model.h
612===================================================================612===================================================================
613--- /dev/null 1970-01-01 00:00:00.000000000 +0000613--- /dev/null 1970-01-01 00:00:00.000000000 +0000
614+++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-03-11 15:02:44.701138814 +0100614+++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-03-11 17:15:56.521258733 +0100
615@@ -0,0 +1,30 @@615@@ -0,0 +1,30 @@
616+/*616+/*
617+ * Copyright 2014 Canonical Ltd617+ * Copyright 2014 Canonical Ltd
@@ -645,8 +645,8 @@
645+#endif645+#endif
646Index: evince-3.10.3/shell/ev-sidebar-bookmarks.c646Index: evince-3.10.3/shell/ev-sidebar-bookmarks.c
647===================================================================647===================================================================
648--- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c 2014-03-11 15:02:44.713138815 +0100648--- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c 2014-03-11 17:15:56.533258733 +0100
649+++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-03-11 15:02:44.701138814 +0100649+++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-03-11 17:15:56.521258733 +0100
650@@ -40,11 +40,6 @@650@@ -40,11 +40,6 @@
651 N_COLUMNS651 N_COLUMNS
652 };652 };
@@ -716,8 +716,8 @@
716 GtkWidget *716 GtkWidget *
717Index: evince-3.10.3/shell/ev-toolbar.c717Index: evince-3.10.3/shell/ev-toolbar.c
718===================================================================718===================================================================
719--- evince-3.10.3.orig/shell/ev-toolbar.c 2014-03-11 15:02:44.713138815 +0100719--- evince-3.10.3.orig/shell/ev-toolbar.c 2014-03-11 17:15:56.533258733 +0100
720+++ evince-3.10.3/shell/ev-toolbar.c 2014-03-11 15:02:44.701138814 +0100720+++ evince-3.10.3/shell/ev-toolbar.c 2014-03-11 17:15:56.521258733 +0100
721@@ -24,9 +24,12 @@721@@ -24,9 +24,12 @@
722 722
723 #include "ev-toolbar.h"723 #include "ev-toolbar.h"
@@ -984,8 +984,8 @@
984 static void984 static void
985Index: evince-3.10.3/shell/ev-utils.c985Index: evince-3.10.3/shell/ev-utils.c
986===================================================================986===================================================================
987--- evince-3.10.3.orig/shell/ev-utils.c 2014-03-11 15:02:44.713138815 +0100987--- evince-3.10.3.orig/shell/ev-utils.c 2014-03-11 17:15:56.533258733 +0100
988+++ evince-3.10.3/shell/ev-utils.c 2014-03-11 15:02:44.701138814 +0100988+++ evince-3.10.3/shell/ev-utils.c 2014-03-11 17:15:56.521258733 +0100
989@@ -22,6 +22,7 @@989@@ -22,6 +22,7 @@
990 990
991 #include "ev-utils.h"991 #include "ev-utils.h"
@@ -1087,8 +1087,8 @@
1087+}1087+}
1088Index: evince-3.10.3/shell/ev-utils.h1088Index: evince-3.10.3/shell/ev-utils.h
1089===================================================================1089===================================================================
1090--- evince-3.10.3.orig/shell/ev-utils.h 2014-03-11 15:02:44.713138815 +01001090--- evince-3.10.3.orig/shell/ev-utils.h 2014-03-11 17:15:56.533258733 +0100
1091+++ evince-3.10.3/shell/ev-utils.h 2014-03-11 15:02:44.701138814 +01001091+++ evince-3.10.3/shell/ev-utils.h 2014-03-11 17:15:56.521258733 +0100
1092@@ -42,6 +42,13 @@1092@@ -42,6 +42,13 @@
1093 void file_chooser_dialog_add_writable_pixbuf_formats (GtkFileChooser *chooser);1093 void file_chooser_dialog_add_writable_pixbuf_formats (GtkFileChooser *chooser);
1094 GdkPixbufFormat* get_gdk_pixbuf_format_by_extension (const gchar *uri);1094 GdkPixbufFormat* get_gdk_pixbuf_format_by_extension (const gchar *uri);
@@ -1105,8 +1105,8 @@
1105 #endif /* __EV_VIEW_H__ */1105 #endif /* __EV_VIEW_H__ */
1106Index: evince-3.10.3/shell/ev-window.c1106Index: evince-3.10.3/shell/ev-window.c
1107===================================================================1107===================================================================
1108--- evince-3.10.3.orig/shell/ev-window.c 2014-03-11 15:02:44.713138815 +01001108--- evince-3.10.3.orig/shell/ev-window.c 2014-03-11 17:15:56.533258733 +0100
1109+++ evince-3.10.3/shell/ev-window.c 2014-03-11 15:02:44.705138814 +01001109+++ evince-3.10.3/shell/ev-window.c 2014-03-11 17:15:56.525258733 +0100
1110@@ -87,10 +87,10 @@1110@@ -87,10 +87,10 @@
1111 #include "ev-print-operation.h"1111 #include "ev-print-operation.h"
1112 #include "ev-progress-message-area.h"1112 #include "ev-progress-message-area.h"
@@ -3944,8 +3944,8 @@
3944+}3944+}
3945Index: evince-3.10.3/shell/ev-window.h3945Index: evince-3.10.3/shell/ev-window.h
3946===================================================================3946===================================================================
3947--- evince-3.10.3.orig/shell/ev-window.h 2014-03-11 15:02:44.713138815 +01003947--- evince-3.10.3.orig/shell/ev-window.h 2014-03-11 17:15:56.533258733 +0100
3948+++ evince-3.10.3/shell/ev-window.h 2014-03-11 15:02:44.705138814 +01003948+++ evince-3.10.3/shell/ev-window.h 2014-03-11 17:15:56.525258733 +0100
3949@@ -89,7 +89,7 @@3949@@ -89,7 +89,7 @@
3950 GtkUIManager *ev_window_get_ui_manager (EvWindow *ev_window);3950 GtkUIManager *ev_window_get_ui_manager (EvWindow *ev_window);
3951 GtkActionGroup *ev_window_get_main_action_group (EvWindow *ev_window);3951 GtkActionGroup *ev_window_get_main_action_group (EvWindow *ev_window);
@@ -3957,8 +3957,8 @@
3957 3957
3958Index: evince-3.10.3/shell/evince-appmenu.ui3958Index: evince-3.10.3/shell/evince-appmenu.ui
3959===================================================================3959===================================================================
3960--- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-03-11 15:02:44.713138815 +01003960--- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-03-11 17:15:56.533258733 +0100
3961+++ evince-3.10.3/shell/evince-appmenu.ui 2014-03-11 15:02:44.705138814 +01003961+++ evince-3.10.3/shell/evince-appmenu.ui 2014-03-11 17:15:56.525258733 +0100
3962@@ -20,6 +20,16 @@3962@@ -20,6 +20,16 @@
3963 <menu id="appmenu">3963 <menu id="appmenu">
3964 <section>3964 <section>
@@ -3978,8 +3978,8 @@
3978 <attribute name="accel">F1</attribute>3978 <attribute name="accel">F1</attribute>
3979Index: evince-3.10.3/shell/evince-ui.xml3979Index: evince-3.10.3/shell/evince-ui.xml
3980===================================================================3980===================================================================
3981--- evince-3.10.3.orig/shell/evince-ui.xml 2014-03-11 15:02:44.713138815 +01003981--- evince-3.10.3.orig/shell/evince-ui.xml 2014-03-11 17:15:56.533258733 +0100
3982+++ evince-3.10.3/shell/evince-ui.xml 2014-03-11 15:04:00.681139955 +01003982+++ evince-3.10.3/shell/evince-ui.xml 2014-03-11 17:15:56.525258733 +0100
3983@@ -1,86 +1,4 @@3983@@ -1,86 +1,4 @@
3984 <ui>3984 <ui>
3985- <popup name="ActionMenu" accelerators="true">3985- <popup name="ActionMenu" accelerators="true">
@@ -4102,8 +4102,8 @@
4102+4102+
4103Index: evince-3.10.3/shell/evince.gresource.xml4103Index: evince-3.10.3/shell/evince.gresource.xml
4104===================================================================4104===================================================================
4105--- evince-3.10.3.orig/shell/evince.gresource.xml 2014-03-11 15:02:44.713138815 +01004105--- evince-3.10.3.orig/shell/evince.gresource.xml 2014-03-11 17:15:56.533258733 +0100
4106+++ evince-3.10.3/shell/evince.gresource.xml 2014-03-11 15:02:44.705138814 +01004106+++ evince-3.10.3/shell/evince.gresource.xml 2014-03-11 17:15:56.525258733 +0100
4107@@ -19,6 +19,8 @@4107@@ -19,6 +19,8 @@
4108 <gresource prefix="/org/gnome/evince/shell">4108 <gresource prefix="/org/gnome/evince/shell">
4109 <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>4109 <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>
@@ -4117,7 +4117,7 @@
4117Index: evince-3.10.3/shell/menus.ui4117Index: evince-3.10.3/shell/menus.ui
4118===================================================================4118===================================================================
4119--- /dev/null 1970-01-01 00:00:00.000000000 +00004119--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4120+++ evince-3.10.3/shell/menus.ui 2014-03-11 15:04:05.000000000 +01004120+++ evince-3.10.3/shell/menus.ui 2014-03-11 17:16:00.000000000 +0100
4121@@ -0,0 +1,188 @@4121@@ -0,0 +1,188 @@
4122+<?xml version="1.0" encoding="UTF-8"?>4122+<?xml version="1.0" encoding="UTF-8"?>
4123+<!--4123+<!--
@@ -4310,7 +4310,7 @@
4310Index: evince-3.10.3/shell/traditional-menus.ui4310Index: evince-3.10.3/shell/traditional-menus.ui
4311===================================================================4311===================================================================
4312--- /dev/null 1970-01-01 00:00:00.000000000 +00004312--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4313+++ evince-3.10.3/shell/traditional-menus.ui 2014-03-11 15:02:44.709138815 +01004313+++ evince-3.10.3/shell/traditional-menus.ui 2014-03-11 17:15:56.525258733 +0100
4314@@ -0,0 +1,230 @@4314@@ -0,0 +1,230 @@
4315+<?xml version="1.0" encoding="UTF-8"?>4315+<?xml version="1.0" encoding="UTF-8"?>
4316+<!--4316+<!--
@@ -4544,8 +4544,8 @@
4544+</interface>4544+</interface>
4545Index: evince-3.10.3/po/POTFILES.in4545Index: evince-3.10.3/po/POTFILES.in
4546===================================================================4546===================================================================
4547--- evince-3.10.3.orig/po/POTFILES.in 2014-03-11 15:02:44.713138815 +01004547--- evince-3.10.3.orig/po/POTFILES.in 2014-03-11 17:15:56.533258733 +0100
4548+++ evince-3.10.3/po/POTFILES.in 2014-03-11 15:02:44.709138815 +01004548+++ evince-3.10.3/po/POTFILES.in 2014-03-11 17:15:56.525258733 +0100
4549@@ -56,3 +56,6 @@4549@@ -56,3 +56,6 @@
4550 shell/ev-window-title.c4550 shell/ev-window-title.c
4551 shell/main.c4551 shell/main.c
@@ -4556,7 +4556,7 @@
4556Index: evince-3.10.3/shell/popup-menus.ui4556Index: evince-3.10.3/shell/popup-menus.ui
4557===================================================================4557===================================================================
4558--- /dev/null 1970-01-01 00:00:00.000000000 +00004558--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4559+++ evince-3.10.3/shell/popup-menus.ui 2014-03-11 15:02:44.709138815 +01004559+++ evince-3.10.3/shell/popup-menus.ui 2014-03-11 17:15:56.525258733 +0100
4560@@ -0,0 +1,114 @@4560@@ -0,0 +1,114 @@
4561+<?xml version="1.0" encoding="UTF-8"?>4561+<?xml version="1.0" encoding="UTF-8"?>
4562+<!--4562+<!--
45634563
=== added file 'debian/patches/add-secondary-and-tertiary-keybindings.patch'
--- debian/patches/add-secondary-and-tertiary-keybindings.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/add-secondary-and-tertiary-keybindings.patch 2014-03-11 16:19:47 +0000
@@ -0,0 +1,81 @@
1From 92845bc09910884a4762102897244bcb45d7c46f Mon Sep 17 00:00:00 2001
2From: Lars Uebernickel <lars.uebernickel@canonical.com>
3Date: Tue, 11 Mar 2014 17:00:02 +0100
4Subject: [PATCH] Add secondary (and tertiary) keybindings
5
6gtk_application_add_accelerator() can only add one accel per action.
7Duplicate the actions so that we can add multiple accels. This is very
8gross, but only needed until we update to gtk 3.12, which introduces a
9new function that can handle setting multiple accels for a single
10action.
11---
12 shell/ev-application.c | 9 +++++++++
13 shell/ev-window.c | 9 +++++++++
14 2 files changed, 18 insertions(+)
15
16Index: evince-3.10.3/shell/ev-application.c
17===================================================================
18--- evince-3.10.3.orig/shell/ev-application.c 2014-03-11 17:17:53.065260481 +0100
19+++ evince-3.10.3/shell/ev-application.c 2014-03-11 17:17:53.057260481 +0100
20@@ -1110,6 +1110,7 @@
21 "win.save-copy", "<Ctrl>S", NULL,
22 "win.print", "<Ctrl>P", NULL,
23 "win.copy", "<Ctrl>C", "<Ctrl>Insert", NULL,
24+ "win.copy2", "<Ctrl>Insert", NULL,
25 "win.select-all", "<Ctrl>A", NULL,
26 "win.save-settings", "<Ctrl>T", NULL,
27 "win.go-first-page", "<Ctrl>Home", NULL,
28@@ -1124,13 +1125,21 @@
29 "win.go-backward", "<Shift>Page_Up", NULL,
30 "win.go-forward", "<Shift>Page_Down", NULL,
31 "win.go-next-page", "<Ctrl>Page_Down", "n", NULL,
32+ "win.go-next-page2", "n", NULL,
33 "win.go-previous-page", "<Ctrl>Page_Up", "p", NULL,
34+ "win.go-previous-page2", "p", NULL,
35 "win.sizing-mode::fit-page", "f", NULL,
36 "win.sizing-mode::fit-width", "w", NULL,
37 "win.open-menu", "F10", NULL,
38 "win.caret-navigation", "F7", NULL,
39 "win.zoom-in", "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL,
40+ "win.zoom-in2", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL,
41+ "win.zoom-in3", "KP_Add", "<Ctrl>KP_Add", NULL,
42+ "win.zoom-in4", "<Ctrl>KP_Add", NULL,
43 "win.zoom-out", "minus", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
44+ "win.zoom-out2", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
45+ "win.zoom-out3", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
46+ "win.zoom-out4", "<Ctrl>KP_Subtract", NULL,
47 "win.show-side-pane", "F9", NULL,
48 "win.fullscreen", "F11", NULL,
49 "win.presentation", "F5", NULL,
50Index: evince-3.10.3/shell/ev-window.c
51===================================================================
52--- evince-3.10.3.orig/shell/ev-window.c 2014-03-11 17:17:53.065260481 +0100
53+++ evince-3.10.3/shell/ev-window.c 2014-03-11 17:17:53.057260481 +0100
54@@ -6658,10 +6658,13 @@
55 { "print", ev_window_activate_print_action, NULL, NULL, NULL },
56 { "show-properties", ev_window_activate_show_properties_action, NULL, NULL, NULL },
57 { "copy", ev_window_activate_copy_action, NULL, NULL, NULL },
58+ { "copy2", ev_window_activate_copy_action, NULL, NULL, NULL },
59 { "select-all", ev_window_activate_select_all_action, NULL, NULL, NULL },
60 { "save-settings", ev_window_activate_save_settings_action, NULL, NULL, NULL },
61 { "go-previous-page", ev_window_activate_go_previous_page_action, NULL, NULL, NULL },
62+ { "go-previous-page2", ev_window_activate_go_previous_page_action, NULL, NULL, NULL },
63 { "go-next-page", ev_window_activate_go_next_page_action, NULL, NULL, NULL },
64+ { "go-next-page2", ev_window_activate_go_next_page_action, NULL, NULL, NULL },
65 { "go-first-page", ev_window_activate_go_first_page_action, NULL, NULL, NULL },
66 { "go-last-page", ev_window_activate_go_last_page_action, NULL, NULL, NULL },
67 { "go-forward", ev_window_activate_go_forward_action, NULL, NULL, NULL },
68@@ -6680,7 +6683,13 @@
69 { "rotate-left", ev_window_activate_rotate_left_action, NULL, NULL, NULL },
70 { "rotate-right", ev_window_activate_rotate_right_action, NULL, NULL, NULL },
71 { "zoom-in", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
72+ { "zoom-in2", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
73+ { "zoom-in3", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
74+ { "zoom-in4", ev_window_activate_zoom_in_action, NULL, NULL, NULL },
75 { "zoom-out", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
76+ { "zoom-out2", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
77+ { "zoom-out3", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
78+ { "zoom-out4", ev_window_activate_zoom_out_action, NULL, NULL, NULL },
79 { "reload", ev_window_activate_reload_action, NULL, NULL, NULL },
80 { "auto-scroll", ev_window_activate_auto_scroll_action, NULL, NULL, NULL },
81 { "add-bookmark", ev_window_activate_add_bookmark_action, NULL, NULL, NULL },
082
=== modified file 'debian/patches/series'
--- debian/patches/series 2014-02-10 17:43:04 +0000
+++ debian/patches/series 2014-03-11 16:19:47 +0000
@@ -2,3 +2,4 @@
2git_Don-t-allow-Send-To-when-there-is-no-mail-client-ava.patch2git_Don-t-allow-Send-To-when-there-is-no-mail-client-ava.patch
30001-Port-to-GMenuModel-and-add-menu-bar.patch30001-Port-to-GMenuModel-and-add-menu-bar.patch
40002-Don-t-use-gtk_application_set_accels_for_action.patch40002-Don-t-use-gtk_application_set_accels_for_action.patch
5add-secondary-and-tertiary-keybindings.patch

Subscribers

People subscribed via source and target branches

to all changes: