Evince

Merge lp:~larsu/evince/fix-accels into lp:~ubuntu-desktop/evince/ubuntu

  1. fix-accels
  2. Merge into ubuntu
Proposed by Lars Karlitski
Status: Merged
Merged at revision: 231
Proposed branch: lp:~larsu/evince/fix-accels
Merge into: lp:~ubuntu-desktop/evince/ubuntu
Diff against target: 662 lines (+222/-276)
4 files modified
debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch (+35/-36)
debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch (+186/-0)
debian/patches/0002-Remove-gtk_application_set_accels_for_actions.patch (+0/-239)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp:~larsu/evince/fix-accels
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+205637@code.launchpad.net

Commit message

Fix gtk 3.10 menu patch and remove invalid free()

This fixes accelerators on GNOME shell and a crash when activating "Save As".

Description of the change

Fix gtk 3.10 menu patch and remove invalid free()

This fixes accelerators on GNOME shell and a crash when activating "Save As".

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-02-07 16:24:37 +0000
+++ debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch 2014-02-10 17:52:12 +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-02-07 16:21:43.333330333 +000033--- evince-3.10.3.orig/shell/Makefile.am 2014-02-10 17:35:01.074434692 +0100
34+++ evince-3.10.3/shell/Makefile.am 2014-02-07 16:21:43.317330332 +000034+++ evince-3.10.3/shell/Makefile.am 2014-02-10 17:35:01.050434692 +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-02-07 16:21:43.333330333 +000062--- evince-3.10.3.orig/shell/ev-application.c 2014-02-10 17:35:01.074434692 +0100
63+++ evince-3.10.3/shell/ev-application.c 2014-02-07 16:21:44.000000000 +000063+++ evince-3.10.3/shell/ev-application.c 2014-02-10 17:35:15.000000000 +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"
@@ -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-02-07 16:21:43.333330333 +0000450--- evince-3.10.3.orig/shell/ev-application.h 2014-02-10 17:35:01.074434692 +0100
451+++ evince-3.10.3/shell/ev-application.h 2014-02-07 16:21:43.317330332 +0000451+++ evince-3.10.3/shell/ev-application.h 2014-02-10 17:35:01.054434692 +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-02-07 16:21:43.333330333 +0000469--- evince-3.10.3.orig/shell/ev-bookmarks.c 2014-02-10 17:35:01.074434692 +0100
470+++ evince-3.10.3/shell/ev-bookmarks.c 2014-02-07 16:21:43.317330332 +0000470+++ evince-3.10.3/shell/ev-bookmarks.c 2014-02-10 17:35:01.054434692 +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-02-07 16:21:43.333330333 +0000488--- evince-3.10.3.orig/shell/ev-bookmarks.h 2014-02-10 17:35:01.074434692 +0100
489+++ evince-3.10.3/shell/ev-bookmarks.h 2014-02-07 16:21:43.317330332 +0000489+++ evince-3.10.3/shell/ev-bookmarks.h 2014-02-10 17:35:01.054434692 +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-02-07 16:21:43.321330332 +0000501+++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-02-10 17:35:01.054434692 +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-02-07 16:21:43.321330332 +0000614+++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-02-10 17:35:01.058434692 +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-02-07 16:21:43.333330333 +0000648--- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c 2014-02-10 17:35:01.074434692 +0100
649+++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-02-07 16:21:43.321330332 +0000649+++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-02-10 17:35:01.058434692 +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-02-07 16:21:43.333330333 +0000719--- evince-3.10.3.orig/shell/ev-toolbar.c 2014-02-10 17:35:01.074434692 +0100
720+++ evince-3.10.3/shell/ev-toolbar.c 2014-02-07 16:21:43.321330332 +0000720+++ evince-3.10.3/shell/ev-toolbar.c 2014-02-10 17:35:01.058434692 +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-02-07 16:21:43.333330333 +0000987--- evince-3.10.3.orig/shell/ev-utils.c 2014-02-10 17:35:01.074434692 +0100
988+++ evince-3.10.3/shell/ev-utils.c 2014-02-07 16:21:43.321330332 +0000988+++ evince-3.10.3/shell/ev-utils.c 2014-02-10 17:35:39.610433331 +0100
989@@ -22,6 +22,7 @@989@@ -22,6 +22,7 @@
990 990
991 #include "ev-utils.h"991 #include "ev-utils.h"
@@ -994,7 +994,7 @@
994 994
995 #include <string.h>995 #include <string.h>
996 #include <math.h>996 #include <math.h>
997@@ -391,3 +392,91 @@997@@ -391,3 +392,90 @@
998 g_slist_free (pixbuf_formats);998 g_slist_free (pixbuf_formats);
999 return NULL;999 return NULL;
1000 }1000 }
@@ -1084,12 +1084,11 @@
1084+ }1084+ }
1085+1085+
1086+ g_free (folder_uri);1086+ g_free (folder_uri);
1087+ g_free (parent_uri);
1088+}1087+}
1089Index: evince-3.10.3/shell/ev-utils.h1088Index: evince-3.10.3/shell/ev-utils.h
1090===================================================================1089===================================================================
1091--- evince-3.10.3.orig/shell/ev-utils.h 2014-02-07 16:21:43.333330333 +00001090--- evince-3.10.3.orig/shell/ev-utils.h 2014-02-10 17:35:01.074434692 +0100
1092+++ evince-3.10.3/shell/ev-utils.h 2014-02-07 16:21:43.321330332 +00001091+++ evince-3.10.3/shell/ev-utils.h 2014-02-10 17:35:01.058434692 +0100
1093@@ -42,6 +42,13 @@1092@@ -42,6 +42,13 @@
1094 void file_chooser_dialog_add_writable_pixbuf_formats (GtkFileChooser *chooser);1093 void file_chooser_dialog_add_writable_pixbuf_formats (GtkFileChooser *chooser);
1095 GdkPixbufFormat* get_gdk_pixbuf_format_by_extension (const gchar *uri);1094 GdkPixbufFormat* get_gdk_pixbuf_format_by_extension (const gchar *uri);
@@ -1106,8 +1105,8 @@
1106 #endif /* __EV_VIEW_H__ */1105 #endif /* __EV_VIEW_H__ */
1107Index: evince-3.10.3/shell/ev-window.c1106Index: evince-3.10.3/shell/ev-window.c
1108===================================================================1107===================================================================
1109--- evince-3.10.3.orig/shell/ev-window.c 2014-02-07 16:21:43.333330333 +00001108--- evince-3.10.3.orig/shell/ev-window.c 2014-02-10 17:35:01.074434692 +0100
1110+++ evince-3.10.3/shell/ev-window.c 2014-02-07 16:21:43.325330332 +00001109+++ evince-3.10.3/shell/ev-window.c 2014-02-10 17:35:01.066434692 +0100
1111@@ -87,10 +87,10 @@1110@@ -87,10 +87,10 @@
1112 #include "ev-print-operation.h"1111 #include "ev-print-operation.h"
1113 #include "ev-progress-message-area.h"1112 #include "ev-progress-message-area.h"
@@ -3382,8 +3381,8 @@
3382+}3381+}
3383Index: evince-3.10.3/shell/ev-window.h3382Index: evince-3.10.3/shell/ev-window.h
3384===================================================================3383===================================================================
3385--- evince-3.10.3.orig/shell/ev-window.h 2014-02-07 16:21:43.333330333 +00003384--- evince-3.10.3.orig/shell/ev-window.h 2014-02-10 17:35:01.074434692 +0100
3386+++ evince-3.10.3/shell/ev-window.h 2014-02-07 16:21:43.325330332 +00003385+++ evince-3.10.3/shell/ev-window.h 2014-02-10 17:35:01.066434692 +0100
3387@@ -89,7 +89,7 @@3386@@ -89,7 +89,7 @@
3388 GtkUIManager *ev_window_get_ui_manager (EvWindow *ev_window);3387 GtkUIManager *ev_window_get_ui_manager (EvWindow *ev_window);
3389 GtkActionGroup *ev_window_get_main_action_group (EvWindow *ev_window);3388 GtkActionGroup *ev_window_get_main_action_group (EvWindow *ev_window);
@@ -3395,8 +3394,8 @@
3395 3394
3396Index: evince-3.10.3/shell/evince-appmenu.ui3395Index: evince-3.10.3/shell/evince-appmenu.ui
3397===================================================================3396===================================================================
3398--- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-02-07 16:21:43.333330333 +00003397--- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-02-10 17:35:01.074434692 +0100
3399+++ evince-3.10.3/shell/evince-appmenu.ui 2014-02-07 16:21:43.325330332 +00003398+++ evince-3.10.3/shell/evince-appmenu.ui 2014-02-10 17:35:01.066434692 +0100
3400@@ -20,6 +20,16 @@3399@@ -20,6 +20,16 @@
3401 <menu id="appmenu">3400 <menu id="appmenu">
3402 <section>3401 <section>
@@ -3416,8 +3415,8 @@
3416 <attribute name="accel">F1</attribute>3415 <attribute name="accel">F1</attribute>
3417Index: evince-3.10.3/shell/evince-ui.xml3416Index: evince-3.10.3/shell/evince-ui.xml
3418===================================================================3417===================================================================
3419--- evince-3.10.3.orig/shell/evince-ui.xml 2014-02-07 16:21:43.333330333 +00003418--- evince-3.10.3.orig/shell/evince-ui.xml 2014-02-10 17:35:01.074434692 +0100
3420+++ evince-3.10.3/shell/evince-ui.xml 2014-02-07 16:21:43.329330332 +00003419+++ evince-3.10.3/shell/evince-ui.xml 2014-02-10 17:35:01.066434692 +0100
3421@@ -1,70 +1,10 @@3420@@ -1,70 +1,10 @@
3422 <ui>3421 <ui>
3423- <popup name="ActionMenu" accelerators="true">3422- <popup name="ActionMenu" accelerators="true">
@@ -3531,8 +3530,8 @@
3531 </ui>3530 </ui>
3532Index: evince-3.10.3/shell/evince.gresource.xml3531Index: evince-3.10.3/shell/evince.gresource.xml
3533===================================================================3532===================================================================
3534--- evince-3.10.3.orig/shell/evince.gresource.xml 2014-02-07 16:21:43.333330333 +00003533--- evince-3.10.3.orig/shell/evince.gresource.xml 2014-02-10 17:35:01.074434692 +0100
3535+++ evince-3.10.3/shell/evince.gresource.xml 2014-02-07 16:21:43.329330332 +00003534+++ evince-3.10.3/shell/evince.gresource.xml 2014-02-10 17:35:01.066434692 +0100
3536@@ -19,6 +19,7 @@3535@@ -19,6 +19,7 @@
3537 <gresource prefix="/org/gnome/evince/shell">3536 <gresource prefix="/org/gnome/evince/shell">
3538 <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>3537 <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>
@@ -3545,7 +3544,7 @@
3545Index: evince-3.10.3/shell/menus.ui3544Index: evince-3.10.3/shell/menus.ui
3546===================================================================3545===================================================================
3547--- /dev/null 1970-01-01 00:00:00.000000000 +00003546--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3548+++ evince-3.10.3/shell/menus.ui 2014-02-07 16:21:44.000000000 +00003547+++ evince-3.10.3/shell/menus.ui 2014-02-10 17:35:15.000000000 +0100
3549@@ -0,0 +1,188 @@3548@@ -0,0 +1,188 @@
3550+<?xml version="1.0" encoding="UTF-8"?>3549+<?xml version="1.0" encoding="UTF-8"?>
3551+<!--3550+<!--
@@ -3738,7 +3737,7 @@
3738Index: evince-3.10.3/shell/traditional-menus.ui3737Index: evince-3.10.3/shell/traditional-menus.ui
3739===================================================================3738===================================================================
3740--- /dev/null 1970-01-01 00:00:00.000000000 +00003739--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3741+++ evince-3.10.3/shell/traditional-menus.ui 2014-02-07 16:23:52.237334214 +00003740+++ evince-3.10.3/shell/traditional-menus.ui 2014-02-10 17:35:01.066434692 +0100
3742@@ -0,0 +1,230 @@3741@@ -0,0 +1,230 @@
3743+<?xml version="1.0" encoding="UTF-8"?>3742+<?xml version="1.0" encoding="UTF-8"?>
3744+<!--3743+<!--
@@ -3972,8 +3971,8 @@
3972+</interface>3971+</interface>
3973Index: evince-3.10.3/po/POTFILES.in3972Index: evince-3.10.3/po/POTFILES.in
3974===================================================================3973===================================================================
3975--- evince-3.10.3.orig/po/POTFILES.in 2014-02-07 16:21:43.333330333 +00003974--- evince-3.10.3.orig/po/POTFILES.in 2014-02-10 17:35:01.074434692 +0100
3976+++ evince-3.10.3/po/POTFILES.in 2014-02-07 16:21:43.329330332 +00003975+++ evince-3.10.3/po/POTFILES.in 2014-02-10 17:35:01.066434692 +0100
3977@@ -56,3 +56,6 @@3976@@ -56,3 +56,6 @@
3978 shell/ev-window-title.c3977 shell/ev-window-title.c
3979 shell/main.c3978 shell/main.c
39803979
=== added file 'debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch'
--- debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch 2014-02-10 17:52:12 +0000
@@ -0,0 +1,186 @@
1From 6781213261c36f4f6c417b06da630a49484faab4 Mon Sep 17 00:00:00 2001
2From: Lars Uebernickel <lars.uebernickel@canonical.com>
3Date: Mon, 10 Feb 2014 18:13:56 +0100
4Subject: [PATCH] Don't use gtk_application_set_accels_for_action()
5
6Gtk 3.10 doesn't have this function. Change that to use
7gtk_application_add_accelerator. Also add the accelerators to menus.xml
8so that they show up in the UI. (It should be enough to only add them to
9menus.xml, but gtk doesn't seem to pick those up. It's not worth fixing
10that bug as the accelerator handling is revamped in 3.12 and the this
11workaround works fine.)
12---
13 shell/ev-application.c | 2 +-
14 shell/menus.ui | 22 ++++++++++++++++++++++
15 2 files changed, 23 insertions(+), 1 deletion(-)
16
17diff --git a/shell/ev-application.c b/shell/ev-application.c
18index e2d87af..2c4b7b3 100644
19--- a/shell/ev-application.c
20+++ b/shell/ev-application.c
21@@ -1176,7 +1176,7 @@ ev_application_startup (GApplication *gapplication)
22 it = action_accels;
23 while (it[0])
24 {
25- gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]);
26+ gtk_application_add_accelerator (GTK_APPLICATION (application), it[1], it[0], NULL);
27 it += g_strv_length ((gchar **) it) + 1;
28 }
29 }
30diff --git a/shell/menus.ui b/shell/menus.ui
31index c3006f8..1d9a32e 100644
32--- a/shell/menus.ui
33+++ b/shell/menus.ui
34@@ -23,6 +23,7 @@
35 <item>
36 <attribute name="label" translatable="yes">_Open</attribute>
37 <attribute name="action">app.open</attribute>
38+ <attribute name="accel">&lt;Ctrl&gt;O</attribute>
39 </item>
40 </section>
41 <section>
42@@ -33,6 +34,7 @@
43 <item>
44 <attribute name="label" translatable="yes">_Help</attribute>
45 <attribute name="action">app.help</attribute>
46+ <attribute name="accel">F1</attribute>
47 </item>
48 </section>
49 </menu>
50@@ -52,36 +54,43 @@
51 <item>
52 <attribute name="label" translatable="yes">Side _Pane</attribute>
53 <attribute name="action">win.show-side-pane</attribute>
54+ <attribute name="accel">F9</attribute>
55 </item>
56 </section>
57 <section>
58 <item>
59 <attribute name="label" translatable="yes">_Fullscreen</attribute>
60 <attribute name="action">win.fullscreen</attribute>
61+ <attribute name="accel">F11</attribute>
62 </item>
63 <item>
64 <attribute name="label" translatable="yes">Pre_sentation</attribute>
65 <attribute name="action">win.presentation</attribute>
66+ <attribute name="accel">F5</attribute>
67 </item>
68 </section>
69 <section>
70 <item>
71 <attribute name="label" translatable="yes">Rotate _Left</attribute>
72 <attribute name="action">win.rotate-left</attribute>
73+ <attribute name="accel">&lt;Ctrl&gt;Left</attribute>
74 </item>
75 <item>
76 <attribute name="label" translatable="yes">Rotate _Right</attribute>
77 <attribute name="action">win.rotate-right</attribute>
78+ <attribute name="accel">&lt;Ctrl&gt;Right</attribute>
79 </item>
80 </section>
81 <section>
82 <item>
83 <attribute name="label" translatable="yes">Zoom _In</attribute>
84 <attribute name="action">win.zoom-in</attribute>
85+ <attribute name="accel">&lt;Ctrl&gt;plus</attribute>
86 </item>
87 <item>
88 <attribute name="label" translatable="yes">Zoom _Out</attribute>
89 <attribute name="action">win.zoom-out</attribute>
90+ <attribute name="accel">&lt;Ctrl&gt;minus</attribute>
91 </item>
92 </section>
93 <section>
94@@ -92,12 +101,14 @@
95 <item>
96 <attribute name="label" translatable="yes">_Inverted Colors</attribute>
97 <attribute name="action">win.inverted-colors</attribute>
98+ <attribute name="accel">&lt;Ctrl&gt;I</attribute>
99 </item>
100 </section>
101 <section>
102 <item>
103 <attribute name="label" translatable="yes">_Reload</attribute>
104 <attribute name="action">win.reload</attribute>
105+ <attribute name="accel">&lt;Ctrl&gt;R</attribute>
106 </item>
107 </section>
108 </menu>
109@@ -107,10 +118,12 @@
110 <item>
111 <attribute name="label" translatable="yes">_Open…</attribute>
112 <attribute name="action">app.open</attribute>
113+ <attribute name="accel">&lt;Ctrl&gt;O</attribute>
114 </item>
115 <item>
116 <attribute name="label" translatable="yes">Op_en a Copy</attribute>
117 <attribute name="action">win.open-copy</attribute>
118+ <attribute name="accel">&lt;Ctrl&gt;N</attribute>
119 </item>
120 <item>
121 <attribute name="label" translatable="yes">_Recent</attribute>
122@@ -120,6 +133,7 @@
123 <item>
124 <attribute name="label" translatable="yes">_Save a Copy…</attribute>
125 <attribute name="action">win.save-copy</attribute>
126+ <attribute name="accel">&lt;Ctrl&gt;S</attribute>
127 </item>
128 <item>
129 <attribute name="label" translatable="yes">Send _To…</attribute>
130@@ -132,22 +146,26 @@
131 <item>
132 <attribute name="label" translatable="yes">_Print…</attribute>
133 <attribute name="action">win.print</attribute>
134+ <attribute name="accel">&lt;Ctrl&gt;P</attribute>
135 </item>
136 </section>
137 <section>
138 <item>
139 <attribute name="label" translatable="yes">P_roperties…</attribute>
140 <attribute name="action">win.show-properties</attribute>
141+ <attribute name="accel">&lt;Alt&gt;Return</attribute>
142 </item>
143 </section>
144 <section>
145 <item>
146 <attribute name="label" translatable="yes">_Copy</attribute>
147 <attribute name="action">win.copy</attribute>
148+ <attribute name="accel">&lt;Ctrl&gt;C</attribute>
149 </item>
150 <item>
151 <attribute name="label" translatable="yes">Select _All</attribute>
152 <attribute name="action">win.select-all</attribute>
153+ <attribute name="accel">&lt;Ctrl&gt;A</attribute>
154 </item>
155 </section>
156 <section>
157@@ -160,22 +178,26 @@
158 <item>
159 <attribute name="label" translatable="yes">_First Page</attribute>
160 <attribute name="action">win.go-first-page</attribute>
161+ <attribute name="accel">&lt;Ctrl&gt;Home</attribute>
162 </item>
163 <item>
164 <attribute name="label" translatable="yes">_Last Page</attribute>
165 <attribute name="action">win.go-last-page</attribute>
166+ <attribute name="accel">&lt;Ctrl&gt;End</attribute>
167 </item>
168 </section>
169 <section id="bookmarks">
170 <item>
171 <attribute name="label" translatable="yes">_Add Bookmark</attribute>
172 <attribute name="action">win.add-bookmark</attribute>
173+ <attribute name="accel">&lt;Ctrl&gt;D</attribute>
174 </item>
175 </section>
176 <section>
177 <item>
178 <attribute name="label" translatable="yes">_Close</attribute>
179 <attribute name="action">win.close</attribute>
180+ <attribute name="accel">&lt;Ctrl&gt;W</attribute>
181 </item>
182 </section>
183 <section>
184--
1851.9.rc1
186
0187
=== removed file 'debian/patches/0002-Remove-gtk_application_set_accels_for_actions.patch'
--- debian/patches/0002-Remove-gtk_application_set_accels_for_actions.patch 2014-02-07 14:03:40 +0000
+++ debian/patches/0002-Remove-gtk_application_set_accels_for_actions.patch 1970-01-01 00:00:00 +0000
@@ -1,239 +0,0 @@
1From 0720979bf347d25bb9a3ff1fc0660e3ca6dcb259 Mon Sep 17 00:00:00 2001
2From: Lars Uebernickel <lars.uebernickel@canonical.com>
3Date: Mon, 3 Feb 2014 11:50:56 +0000
4Subject: [PATCH 2/2] Remove gtk_application_set_accels_for_actions()
5
6To make evince build with gtk+ 3.10.
7---
8 shell/ev-application.c | 45 ---------------------------------------------
9 1 file changed, 45 deletions(-)
10
11Index: evince-3.10.3/shell/ev-application.c
12===================================================================
13--- evince-3.10.3.orig/shell/ev-application.c 2014-02-07 14:01:07.235558100 +0000
14+++ evince-3.10.3/shell/ev-application.c 2014-02-07 14:01:07.231558100 +0000
15@@ -1104,47 +1104,9 @@
16 { "help", app_help_cb, NULL, NULL, NULL },
17 };
18
19- const gchar *action_accels[] = {
20- "app.open", "<Ctrl>O", NULL,
21- "win.open-copy", "<Ctrl>N", NULL,
22- "win.save-copy", "<Ctrl>S", NULL,
23- "win.print", "<Ctrl>P", NULL,
24- "win.copy", "<Ctrl>C", "<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- "win.go-last-page", "<Ctrl>End", NULL,
29- "win.add-bookmark", "<Ctrl>D", NULL,
30- "win.close", "<Ctrl>W", NULL,
31- "win.escape", "Escape", NULL,
32- "win.find", "<Ctrl>F", "slash", NULL,
33- "win.find-next", "<Ctrl>G", NULL,
34- "win.find-previous", "<Ctrl><Shift>G", NULL,
35- "win.select-page", "<Ctrl>L", NULL,
36- "win.go-backward", "<Shift>Page_Up", NULL,
37- "win.go-forward", "<Shift>Page_Down", NULL,
38- "win.go-next-page", "n", NULL,
39- "win.go-previous-page", "p", NULL,
40- "win.sizing-mode::fit-page", "f", NULL,
41- "win.sizing-mode::fit-width", "w", NULL,
42- "win.open-menu", "F10", NULL,
43- "win.caret-navigation", "F7", NULL,
44- "win.zoom-in", "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL,
45- "win.zoom-out", "minus", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
46- "win.show-side-pane", "F9", NULL,
47- "win.fullscreen", "F11", NULL,
48- "win.presentation", "F5", NULL,
49- "win.rotate-left", "<Ctrl>Left", NULL,
50- "win.rotate-right", "<Ctrl>Right", NULL,
51- "win.inverted-colors", "<Ctrl>I", NULL,
52- "win.reload", "<Ctrl>R", NULL,
53- NULL
54- };
55-
56 EvApplication *application = EV_APPLICATION (gapplication);
57 GtkBuilder *builder;
58 GError *error = NULL;
59- const gchar **it;
60
61 G_APPLICATION_CLASS (ev_application_parent_class)->startup (gapplication);
62
63@@ -1184,18 +1146,15 @@
64 gtk_builder_add_from_resource (builder, "/org/gnome/evince/shell/ui/menus.ui", &error);
65 g_assert_no_error (error);
66
67+ gtk_application_add_accelerator (GTK_APPLICATION (application), "<Ctrl>F", "win.find", NULL);
68+
69 gtk_application_set_app_menu (GTK_APPLICATION (application),
70 G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu")));
71 }
72
73- g_object_unref (builder);
74+ gtk_application_add_accelerator (GTK_APPLICATION (application), "F7", "win.caret-navigation", NULL);
75
76- it = action_accels;
77- while (it[0])
78- {
79- gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]);
80- it += g_strv_length ((gchar **) it) + 1;
81- }
82+ g_object_unref (builder);
83 }
84
85 static void
86Index: evince-3.10.3/shell/menus.ui
87===================================================================
88--- evince-3.10.3.orig/shell/menus.ui 2014-02-07 14:01:07.235558100 +0000
89+++ evince-3.10.3/shell/menus.ui 2014-02-07 14:02:04.683556047 +0000
90@@ -23,6 +23,7 @@
91 <item>
92 <attribute name="label" translatable="yes">_Open</attribute>
93 <attribute name="action">app.open</attribute>
94+ <attribute name="accel">&lt;Ctrl&gt;O</attribute>
95 </item>
96 </section>
97 <section>
98@@ -33,6 +34,7 @@
99 <item>
100 <attribute name="label" translatable="yes">_Help</attribute>
101 <attribute name="action">app.help</attribute>
102+ <attribute name="accel">F1</attribute>
103 </item>
104 </section>
105 </menu>
106@@ -52,36 +54,43 @@
107 <item>
108 <attribute name="label" translatable="yes">Side _Pane</attribute>
109 <attribute name="action">win.show-side-pane</attribute>
110+ <attribute name="accel">F9</attribute>
111 </item>
112 </section>
113 <section>
114 <item>
115 <attribute name="label" translatable="yes">_Fullscreen</attribute>
116 <attribute name="action">win.fullscreen</attribute>
117+ <attribute name="accel">F11</attribute>
118 </item>
119 <item>
120 <attribute name="label" translatable="yes">Pre_sentation</attribute>
121 <attribute name="action">win.presentation</attribute>
122+ <attribute name="accel">F5</attribute>
123 </item>
124 </section>
125 <section>
126 <item>
127 <attribute name="label" translatable="yes">Rotate _Left</attribute>
128 <attribute name="action">win.rotate-left</attribute>
129+ <attribute name="accel">&lt;Ctrl&gt;Left</attribute>
130 </item>
131 <item>
132 <attribute name="label" translatable="yes">Rotate _Right</attribute>
133 <attribute name="action">win.rotate-right</attribute>
134+ <attribute name="accel">&lt;Ctrl&gt;Right</attribute>
135 </item>
136 </section>
137 <section>
138 <item>
139 <attribute name="label" translatable="yes">Zoom _In</attribute>
140 <attribute name="action">win.zoom-in</attribute>
141+ <attribute name="accel">&lt;Ctrl&gt;plus</attribute>
142 </item>
143 <item>
144 <attribute name="label" translatable="yes">Zoom _Out</attribute>
145 <attribute name="action">win.zoom-out</attribute>
146+ <attribute name="accel">&lt;Ctrl&gt;minus</attribute>
147 </item>
148 </section>
149 <section>
150@@ -92,12 +101,14 @@
151 <item>
152 <attribute name="label" translatable="yes">_Inverted Colors</attribute>
153 <attribute name="action">win.inverted-colors</attribute>
154+ <attribute name="accel">&lt;Ctrl&gt;I</attribute>
155 </item>
156 </section>
157 <section>
158 <item>
159 <attribute name="label" translatable="yes">_Reload</attribute>
160 <attribute name="action">win.reload</attribute>
161+ <attribute name="accel">&lt;Ctrl&gt;R</attribute>
162 </item>
163 </section>
164 </menu>
165@@ -107,10 +118,12 @@
166 <item>
167 <attribute name="label" translatable="yes">_Open…</attribute>
168 <attribute name="action">app.open</attribute>
169+ <attribute name="accel">&lt;Ctrl&gt;O</attribute>
170 </item>
171 <item>
172 <attribute name="label" translatable="yes">Op_en a Copy</attribute>
173 <attribute name="action">win.open-copy</attribute>
174+ <attribute name="accel">&lt;Ctrl&gt;N</attribute>
175 </item>
176 <item>
177 <attribute name="label" translatable="yes">_Recent</attribute>
178@@ -120,6 +133,7 @@
179 <item>
180 <attribute name="label" translatable="yes">_Save a Copy…</attribute>
181 <attribute name="action">win.save-copy</attribute>
182+ <attribute name="accel">&lt;Ctrl&gt;S</attribute>
183 </item>
184 <item>
185 <attribute name="label" translatable="yes">Send _To…</attribute>
186@@ -132,22 +146,26 @@
187 <item>
188 <attribute name="label" translatable="yes">_Print…</attribute>
189 <attribute name="action">win.print</attribute>
190+ <attribute name="accel">&lt;Ctrl&gt;P</attribute>
191 </item>
192 </section>
193 <section>
194 <item>
195 <attribute name="label" translatable="yes">P_roperties…</attribute>
196 <attribute name="action">win.show-properties</attribute>
197+ <attribute name="accel">&lt;Alt&gt;Return</attribute>
198 </item>
199 </section>
200 <section>
201 <item>
202 <attribute name="label" translatable="yes">_Copy</attribute>
203 <attribute name="action">win.copy</attribute>
204+ <attribute name="accel">&lt;Ctrl&gt;C</attribute>
205 </item>
206 <item>
207 <attribute name="label" translatable="yes">Select _All</attribute>
208 <attribute name="action">win.select-all</attribute>
209+ <attribute name="accel">&lt;Ctrl&gt;A</attribute>
210 </item>
211 </section>
212 <section>
213@@ -160,22 +178,26 @@
214 <item>
215 <attribute name="label" translatable="yes">_First Page</attribute>
216 <attribute name="action">win.go-first-page</attribute>
217+ <attribute name="accel">&lt;Ctrl&gt;Home</attribute>
218 </item>
219 <item>
220 <attribute name="label" translatable="yes">_Last Page</attribute>
221 <attribute name="action">win.go-last-page</attribute>
222+ <attribute name="accel">&lt;Ctrl&gt;End</attribute>
223 </item>
224 </section>
225 <section id="bookmarks">
226 <item>
227 <attribute name="label" translatable="yes">_Add Bookmark</attribute>
228 <attribute name="action">win.add-bookmark</attribute>
229+ <attribute name="accel">&lt;Ctrl&gt;D</attribute>
230 </item>
231 </section>
232 <section>
233 <item>
234 <attribute name="label" translatable="yes">_Close</attribute>
235 <attribute name="action">win.close</attribute>
236+ <attribute name="accel">&lt;Ctrl&gt;W</attribute>
237 </item>
238 </section>
239 <section>
2400
=== modified file 'debian/patches/series'
--- debian/patches/series 2014-02-04 15:40:21 +0000
+++ debian/patches/series 2014-02-10 17:52:12 +0000
@@ -1,4 +1,4 @@
111_grip_gestures.patch111_grip_gestures.patch
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-Remove-gtk_application_set_accels_for_actions.patch40002-Don-t-use-gtk_application_set_accels_for_action.patch

Subscribers

People subscribed via source and target branches

to all changes: