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
1=== modified file 'debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch'
2--- debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch 2014-02-07 16:24:37 +0000
3+++ debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch 2014-02-10 17:52:12 +0000
4@@ -30,8 +30,8 @@
5
6 Index: evince-3.10.3/shell/Makefile.am
7 ===================================================================
8---- evince-3.10.3.orig/shell/Makefile.am 2014-02-07 16:21:43.333330333 +0000
9-+++ evince-3.10.3/shell/Makefile.am 2014-02-07 16:21:43.317330332 +0000
10+--- evince-3.10.3.orig/shell/Makefile.am 2014-02-10 17:35:01.074434692 +0100
11++++ evince-3.10.3/shell/Makefile.am 2014-02-10 17:35:01.050434692 +0100
12 @@ -75,6 +75,8 @@
13 ev-sidebar-page.h \
14 ev-sidebar-thumbnails.c \
15@@ -59,8 +59,8 @@
16 $(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate-source --c-name ev $<
17 Index: evince-3.10.3/shell/ev-application.c
18 ===================================================================
19---- evince-3.10.3.orig/shell/ev-application.c 2014-02-07 16:21:43.333330333 +0000
20-+++ evince-3.10.3/shell/ev-application.c 2014-02-07 16:21:44.000000000 +0000
21+--- evince-3.10.3.orig/shell/ev-application.c 2014-02-10 17:35:01.074434692 +0100
22++++ evince-3.10.3/shell/ev-application.c 2014-02-10 17:35:15.000000000 +0100
23 @@ -42,6 +42,9 @@
24 #include "ev-application.h"
25 #include "ev-file-helpers.h"
26@@ -447,8 +447,8 @@
27 +}
28 Index: evince-3.10.3/shell/ev-application.h
29 ===================================================================
30---- evince-3.10.3.orig/shell/ev-application.h 2014-02-07 16:21:43.333330333 +0000
31-+++ evince-3.10.3/shell/ev-application.h 2014-02-07 16:21:43.317330332 +0000
32+--- evince-3.10.3.orig/shell/ev-application.h 2014-02-10 17:35:01.074434692 +0100
33++++ evince-3.10.3/shell/ev-application.h 2014-02-10 17:35:01.054434692 +0100
34 @@ -81,6 +81,14 @@
35 GdkScreen *screen,
36 const char *topic);
37@@ -466,8 +466,8 @@
38 #endif /* !EV_APPLICATION_H */
39 Index: evince-3.10.3/shell/ev-bookmarks.c
40 ===================================================================
41---- evince-3.10.3.orig/shell/ev-bookmarks.c 2014-02-07 16:21:43.333330333 +0000
42-+++ evince-3.10.3/shell/ev-bookmarks.c 2014-02-07 16:21:43.317330332 +0000
43+--- evince-3.10.3.orig/shell/ev-bookmarks.c 2014-02-10 17:35:01.074434692 +0100
44++++ evince-3.10.3/shell/ev-bookmarks.c 2014-02-10 17:35:01.054434692 +0100
45 @@ -224,6 +224,14 @@
46 return g_list_copy (bookmarks->items);
47 }
48@@ -485,8 +485,8 @@
49 EvBookmark *bookmark)
50 Index: evince-3.10.3/shell/ev-bookmarks.h
51 ===================================================================
52---- evince-3.10.3.orig/shell/ev-bookmarks.h 2014-02-07 16:21:43.333330333 +0000
53-+++ evince-3.10.3/shell/ev-bookmarks.h 2014-02-07 16:21:43.317330332 +0000
54+--- evince-3.10.3.orig/shell/ev-bookmarks.h 2014-02-10 17:35:01.074434692 +0100
55++++ evince-3.10.3/shell/ev-bookmarks.h 2014-02-10 17:35:01.054434692 +0100
56 @@ -43,6 +43,7 @@
57 GType ev_bookmarks_get_type (void) G_GNUC_CONST;
58 EvBookmarks *ev_bookmarks_new (EvMetadata *metadata);
59@@ -498,7 +498,7 @@
60 Index: evince-3.10.3/shell/ev-recent-menu-model.c
61 ===================================================================
62 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
63-+++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-02-07 16:21:43.321330332 +0000
64++++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-02-10 17:35:01.054434692 +0100
65 @@ -0,0 +1,108 @@
66 +/*
67 + * Copyright 2014 Canonical Ltd
68@@ -611,7 +611,7 @@
69 Index: evince-3.10.3/shell/ev-recent-menu-model.h
70 ===================================================================
71 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
72-+++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-02-07 16:21:43.321330332 +0000
73++++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-02-10 17:35:01.058434692 +0100
74 @@ -0,0 +1,30 @@
75 +/*
76 + * Copyright 2014 Canonical Ltd
77@@ -645,8 +645,8 @@
78 +#endif
79 Index: evince-3.10.3/shell/ev-sidebar-bookmarks.c
80 ===================================================================
81---- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c 2014-02-07 16:21:43.333330333 +0000
82-+++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-02-07 16:21:43.321330332 +0000
83+--- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c 2014-02-10 17:35:01.074434692 +0100
84++++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-02-10 17:35:01.058434692 +0100
85 @@ -40,11 +40,6 @@
86 N_COLUMNS
87 };
88@@ -716,8 +716,8 @@
89 GtkWidget *
90 Index: evince-3.10.3/shell/ev-toolbar.c
91 ===================================================================
92---- evince-3.10.3.orig/shell/ev-toolbar.c 2014-02-07 16:21:43.333330333 +0000
93-+++ evince-3.10.3/shell/ev-toolbar.c 2014-02-07 16:21:43.321330332 +0000
94+--- evince-3.10.3.orig/shell/ev-toolbar.c 2014-02-10 17:35:01.074434692 +0100
95++++ evince-3.10.3/shell/ev-toolbar.c 2014-02-10 17:35:01.058434692 +0100
96 @@ -24,9 +24,12 @@
97
98 #include "ev-toolbar.h"
99@@ -984,8 +984,8 @@
100 static void
101 Index: evince-3.10.3/shell/ev-utils.c
102 ===================================================================
103---- evince-3.10.3.orig/shell/ev-utils.c 2014-02-07 16:21:43.333330333 +0000
104-+++ evince-3.10.3/shell/ev-utils.c 2014-02-07 16:21:43.321330332 +0000
105+--- evince-3.10.3.orig/shell/ev-utils.c 2014-02-10 17:35:01.074434692 +0100
106++++ evince-3.10.3/shell/ev-utils.c 2014-02-10 17:35:39.610433331 +0100
107 @@ -22,6 +22,7 @@
108
109 #include "ev-utils.h"
110@@ -994,7 +994,7 @@
111
112 #include <string.h>
113 #include <math.h>
114-@@ -391,3 +392,91 @@
115+@@ -391,3 +392,90 @@
116 g_slist_free (pixbuf_formats);
117 return NULL;
118 }
119@@ -1084,12 +1084,11 @@
120 + }
121 +
122 + g_free (folder_uri);
123-+ g_free (parent_uri);
124 +}
125 Index: evince-3.10.3/shell/ev-utils.h
126 ===================================================================
127---- evince-3.10.3.orig/shell/ev-utils.h 2014-02-07 16:21:43.333330333 +0000
128-+++ evince-3.10.3/shell/ev-utils.h 2014-02-07 16:21:43.321330332 +0000
129+--- evince-3.10.3.orig/shell/ev-utils.h 2014-02-10 17:35:01.074434692 +0100
130++++ evince-3.10.3/shell/ev-utils.h 2014-02-10 17:35:01.058434692 +0100
131 @@ -42,6 +42,13 @@
132 void file_chooser_dialog_add_writable_pixbuf_formats (GtkFileChooser *chooser);
133 GdkPixbufFormat* get_gdk_pixbuf_format_by_extension (const gchar *uri);
134@@ -1106,8 +1105,8 @@
135 #endif /* __EV_VIEW_H__ */
136 Index: evince-3.10.3/shell/ev-window.c
137 ===================================================================
138---- evince-3.10.3.orig/shell/ev-window.c 2014-02-07 16:21:43.333330333 +0000
139-+++ evince-3.10.3/shell/ev-window.c 2014-02-07 16:21:43.325330332 +0000
140+--- evince-3.10.3.orig/shell/ev-window.c 2014-02-10 17:35:01.074434692 +0100
141++++ evince-3.10.3/shell/ev-window.c 2014-02-10 17:35:01.066434692 +0100
142 @@ -87,10 +87,10 @@
143 #include "ev-print-operation.h"
144 #include "ev-progress-message-area.h"
145@@ -3382,8 +3381,8 @@
146 +}
147 Index: evince-3.10.3/shell/ev-window.h
148 ===================================================================
149---- evince-3.10.3.orig/shell/ev-window.h 2014-02-07 16:21:43.333330333 +0000
150-+++ evince-3.10.3/shell/ev-window.h 2014-02-07 16:21:43.325330332 +0000
151+--- evince-3.10.3.orig/shell/ev-window.h 2014-02-10 17:35:01.074434692 +0100
152++++ evince-3.10.3/shell/ev-window.h 2014-02-10 17:35:01.066434692 +0100
153 @@ -89,7 +89,7 @@
154 GtkUIManager *ev_window_get_ui_manager (EvWindow *ev_window);
155 GtkActionGroup *ev_window_get_main_action_group (EvWindow *ev_window);
156@@ -3395,8 +3394,8 @@
157
158 Index: evince-3.10.3/shell/evince-appmenu.ui
159 ===================================================================
160---- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-02-07 16:21:43.333330333 +0000
161-+++ evince-3.10.3/shell/evince-appmenu.ui 2014-02-07 16:21:43.325330332 +0000
162+--- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-02-10 17:35:01.074434692 +0100
163++++ evince-3.10.3/shell/evince-appmenu.ui 2014-02-10 17:35:01.066434692 +0100
164 @@ -20,6 +20,16 @@
165 <menu id="appmenu">
166 <section>
167@@ -3416,8 +3415,8 @@
168 <attribute name="accel">F1</attribute>
169 Index: evince-3.10.3/shell/evince-ui.xml
170 ===================================================================
171---- evince-3.10.3.orig/shell/evince-ui.xml 2014-02-07 16:21:43.333330333 +0000
172-+++ evince-3.10.3/shell/evince-ui.xml 2014-02-07 16:21:43.329330332 +0000
173+--- evince-3.10.3.orig/shell/evince-ui.xml 2014-02-10 17:35:01.074434692 +0100
174++++ evince-3.10.3/shell/evince-ui.xml 2014-02-10 17:35:01.066434692 +0100
175 @@ -1,70 +1,10 @@
176 <ui>
177 - <popup name="ActionMenu" accelerators="true">
178@@ -3531,8 +3530,8 @@
179 </ui>
180 Index: evince-3.10.3/shell/evince.gresource.xml
181 ===================================================================
182---- evince-3.10.3.orig/shell/evince.gresource.xml 2014-02-07 16:21:43.333330333 +0000
183-+++ evince-3.10.3/shell/evince.gresource.xml 2014-02-07 16:21:43.329330332 +0000
184+--- evince-3.10.3.orig/shell/evince.gresource.xml 2014-02-10 17:35:01.074434692 +0100
185++++ evince-3.10.3/shell/evince.gresource.xml 2014-02-10 17:35:01.066434692 +0100
186 @@ -19,6 +19,7 @@
187 <gresource prefix="/org/gnome/evince/shell">
188 <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>
189@@ -3545,7 +3544,7 @@
190 Index: evince-3.10.3/shell/menus.ui
191 ===================================================================
192 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
193-+++ evince-3.10.3/shell/menus.ui 2014-02-07 16:21:44.000000000 +0000
194++++ evince-3.10.3/shell/menus.ui 2014-02-10 17:35:15.000000000 +0100
195 @@ -0,0 +1,188 @@
196 +<?xml version="1.0" encoding="UTF-8"?>
197 +<!--
198@@ -3738,7 +3737,7 @@
199 Index: evince-3.10.3/shell/traditional-menus.ui
200 ===================================================================
201 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
202-+++ evince-3.10.3/shell/traditional-menus.ui 2014-02-07 16:23:52.237334214 +0000
203++++ evince-3.10.3/shell/traditional-menus.ui 2014-02-10 17:35:01.066434692 +0100
204 @@ -0,0 +1,230 @@
205 +<?xml version="1.0" encoding="UTF-8"?>
206 +<!--
207@@ -3972,8 +3971,8 @@
208 +</interface>
209 Index: evince-3.10.3/po/POTFILES.in
210 ===================================================================
211---- evince-3.10.3.orig/po/POTFILES.in 2014-02-07 16:21:43.333330333 +0000
212-+++ evince-3.10.3/po/POTFILES.in 2014-02-07 16:21:43.329330332 +0000
213+--- evince-3.10.3.orig/po/POTFILES.in 2014-02-10 17:35:01.074434692 +0100
214++++ evince-3.10.3/po/POTFILES.in 2014-02-10 17:35:01.066434692 +0100
215 @@ -56,3 +56,6 @@
216 shell/ev-window-title.c
217 shell/main.c
218
219=== added file 'debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch'
220--- debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch 1970-01-01 00:00:00 +0000
221+++ debian/patches/0002-Don-t-use-gtk_application_set_accels_for_action.patch 2014-02-10 17:52:12 +0000
222@@ -0,0 +1,186 @@
223+From 6781213261c36f4f6c417b06da630a49484faab4 Mon Sep 17 00:00:00 2001
224+From: Lars Uebernickel <lars.uebernickel@canonical.com>
225+Date: Mon, 10 Feb 2014 18:13:56 +0100
226+Subject: [PATCH] Don't use gtk_application_set_accels_for_action()
227+
228+Gtk 3.10 doesn't have this function. Change that to use
229+gtk_application_add_accelerator. Also add the accelerators to menus.xml
230+so that they show up in the UI. (It should be enough to only add them to
231+menus.xml, but gtk doesn't seem to pick those up. It's not worth fixing
232+that bug as the accelerator handling is revamped in 3.12 and the this
233+workaround works fine.)
234+---
235+ shell/ev-application.c | 2 +-
236+ shell/menus.ui | 22 ++++++++++++++++++++++
237+ 2 files changed, 23 insertions(+), 1 deletion(-)
238+
239+diff --git a/shell/ev-application.c b/shell/ev-application.c
240+index e2d87af..2c4b7b3 100644
241+--- a/shell/ev-application.c
242++++ b/shell/ev-application.c
243+@@ -1176,7 +1176,7 @@ ev_application_startup (GApplication *gapplication)
244+ it = action_accels;
245+ while (it[0])
246+ {
247+- gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]);
248++ gtk_application_add_accelerator (GTK_APPLICATION (application), it[1], it[0], NULL);
249+ it += g_strv_length ((gchar **) it) + 1;
250+ }
251+ }
252+diff --git a/shell/menus.ui b/shell/menus.ui
253+index c3006f8..1d9a32e 100644
254+--- a/shell/menus.ui
255++++ b/shell/menus.ui
256+@@ -23,6 +23,7 @@
257+ <item>
258+ <attribute name="label" translatable="yes">_Open</attribute>
259+ <attribute name="action">app.open</attribute>
260++ <attribute name="accel">&lt;Ctrl&gt;O</attribute>
261+ </item>
262+ </section>
263+ <section>
264+@@ -33,6 +34,7 @@
265+ <item>
266+ <attribute name="label" translatable="yes">_Help</attribute>
267+ <attribute name="action">app.help</attribute>
268++ <attribute name="accel">F1</attribute>
269+ </item>
270+ </section>
271+ </menu>
272+@@ -52,36 +54,43 @@
273+ <item>
274+ <attribute name="label" translatable="yes">Side _Pane</attribute>
275+ <attribute name="action">win.show-side-pane</attribute>
276++ <attribute name="accel">F9</attribute>
277+ </item>
278+ </section>
279+ <section>
280+ <item>
281+ <attribute name="label" translatable="yes">_Fullscreen</attribute>
282+ <attribute name="action">win.fullscreen</attribute>
283++ <attribute name="accel">F11</attribute>
284+ </item>
285+ <item>
286+ <attribute name="label" translatable="yes">Pre_sentation</attribute>
287+ <attribute name="action">win.presentation</attribute>
288++ <attribute name="accel">F5</attribute>
289+ </item>
290+ </section>
291+ <section>
292+ <item>
293+ <attribute name="label" translatable="yes">Rotate _Left</attribute>
294+ <attribute name="action">win.rotate-left</attribute>
295++ <attribute name="accel">&lt;Ctrl&gt;Left</attribute>
296+ </item>
297+ <item>
298+ <attribute name="label" translatable="yes">Rotate _Right</attribute>
299+ <attribute name="action">win.rotate-right</attribute>
300++ <attribute name="accel">&lt;Ctrl&gt;Right</attribute>
301+ </item>
302+ </section>
303+ <section>
304+ <item>
305+ <attribute name="label" translatable="yes">Zoom _In</attribute>
306+ <attribute name="action">win.zoom-in</attribute>
307++ <attribute name="accel">&lt;Ctrl&gt;plus</attribute>
308+ </item>
309+ <item>
310+ <attribute name="label" translatable="yes">Zoom _Out</attribute>
311+ <attribute name="action">win.zoom-out</attribute>
312++ <attribute name="accel">&lt;Ctrl&gt;minus</attribute>
313+ </item>
314+ </section>
315+ <section>
316+@@ -92,12 +101,14 @@
317+ <item>
318+ <attribute name="label" translatable="yes">_Inverted Colors</attribute>
319+ <attribute name="action">win.inverted-colors</attribute>
320++ <attribute name="accel">&lt;Ctrl&gt;I</attribute>
321+ </item>
322+ </section>
323+ <section>
324+ <item>
325+ <attribute name="label" translatable="yes">_Reload</attribute>
326+ <attribute name="action">win.reload</attribute>
327++ <attribute name="accel">&lt;Ctrl&gt;R</attribute>
328+ </item>
329+ </section>
330+ </menu>
331+@@ -107,10 +118,12 @@
332+ <item>
333+ <attribute name="label" translatable="yes">_Open…</attribute>
334+ <attribute name="action">app.open</attribute>
335++ <attribute name="accel">&lt;Ctrl&gt;O</attribute>
336+ </item>
337+ <item>
338+ <attribute name="label" translatable="yes">Op_en a Copy</attribute>
339+ <attribute name="action">win.open-copy</attribute>
340++ <attribute name="accel">&lt;Ctrl&gt;N</attribute>
341+ </item>
342+ <item>
343+ <attribute name="label" translatable="yes">_Recent</attribute>
344+@@ -120,6 +133,7 @@
345+ <item>
346+ <attribute name="label" translatable="yes">_Save a Copy…</attribute>
347+ <attribute name="action">win.save-copy</attribute>
348++ <attribute name="accel">&lt;Ctrl&gt;S</attribute>
349+ </item>
350+ <item>
351+ <attribute name="label" translatable="yes">Send _To…</attribute>
352+@@ -132,22 +146,26 @@
353+ <item>
354+ <attribute name="label" translatable="yes">_Print…</attribute>
355+ <attribute name="action">win.print</attribute>
356++ <attribute name="accel">&lt;Ctrl&gt;P</attribute>
357+ </item>
358+ </section>
359+ <section>
360+ <item>
361+ <attribute name="label" translatable="yes">P_roperties…</attribute>
362+ <attribute name="action">win.show-properties</attribute>
363++ <attribute name="accel">&lt;Alt&gt;Return</attribute>
364+ </item>
365+ </section>
366+ <section>
367+ <item>
368+ <attribute name="label" translatable="yes">_Copy</attribute>
369+ <attribute name="action">win.copy</attribute>
370++ <attribute name="accel">&lt;Ctrl&gt;C</attribute>
371+ </item>
372+ <item>
373+ <attribute name="label" translatable="yes">Select _All</attribute>
374+ <attribute name="action">win.select-all</attribute>
375++ <attribute name="accel">&lt;Ctrl&gt;A</attribute>
376+ </item>
377+ </section>
378+ <section>
379+@@ -160,22 +178,26 @@
380+ <item>
381+ <attribute name="label" translatable="yes">_First Page</attribute>
382+ <attribute name="action">win.go-first-page</attribute>
383++ <attribute name="accel">&lt;Ctrl&gt;Home</attribute>
384+ </item>
385+ <item>
386+ <attribute name="label" translatable="yes">_Last Page</attribute>
387+ <attribute name="action">win.go-last-page</attribute>
388++ <attribute name="accel">&lt;Ctrl&gt;End</attribute>
389+ </item>
390+ </section>
391+ <section id="bookmarks">
392+ <item>
393+ <attribute name="label" translatable="yes">_Add Bookmark</attribute>
394+ <attribute name="action">win.add-bookmark</attribute>
395++ <attribute name="accel">&lt;Ctrl&gt;D</attribute>
396+ </item>
397+ </section>
398+ <section>
399+ <item>
400+ <attribute name="label" translatable="yes">_Close</attribute>
401+ <attribute name="action">win.close</attribute>
402++ <attribute name="accel">&lt;Ctrl&gt;W</attribute>
403+ </item>
404+ </section>
405+ <section>
406+--
407+1.9.rc1
408+
409
410=== removed file 'debian/patches/0002-Remove-gtk_application_set_accels_for_actions.patch'
411--- debian/patches/0002-Remove-gtk_application_set_accels_for_actions.patch 2014-02-07 14:03:40 +0000
412+++ debian/patches/0002-Remove-gtk_application_set_accels_for_actions.patch 1970-01-01 00:00:00 +0000
413@@ -1,239 +0,0 @@
414-From 0720979bf347d25bb9a3ff1fc0660e3ca6dcb259 Mon Sep 17 00:00:00 2001
415-From: Lars Uebernickel <lars.uebernickel@canonical.com>
416-Date: Mon, 3 Feb 2014 11:50:56 +0000
417-Subject: [PATCH 2/2] Remove gtk_application_set_accels_for_actions()
418-
419-To make evince build with gtk+ 3.10.
420----
421- shell/ev-application.c | 45 ---------------------------------------------
422- 1 file changed, 45 deletions(-)
423-
424-Index: evince-3.10.3/shell/ev-application.c
425-===================================================================
426---- evince-3.10.3.orig/shell/ev-application.c 2014-02-07 14:01:07.235558100 +0000
427-+++ evince-3.10.3/shell/ev-application.c 2014-02-07 14:01:07.231558100 +0000
428-@@ -1104,47 +1104,9 @@
429- { "help", app_help_cb, NULL, NULL, NULL },
430- };
431-
432-- const gchar *action_accels[] = {
433-- "app.open", "<Ctrl>O", NULL,
434-- "win.open-copy", "<Ctrl>N", NULL,
435-- "win.save-copy", "<Ctrl>S", NULL,
436-- "win.print", "<Ctrl>P", NULL,
437-- "win.copy", "<Ctrl>C", "<Ctrl>Insert", NULL,
438-- "win.select-all", "<Ctrl>A", NULL,
439-- "win.save-settings", "<Ctrl>T", NULL,
440-- "win.go-first-page", "<Ctrl>Home", NULL,
441-- "win.go-last-page", "<Ctrl>End", NULL,
442-- "win.add-bookmark", "<Ctrl>D", NULL,
443-- "win.close", "<Ctrl>W", NULL,
444-- "win.escape", "Escape", NULL,
445-- "win.find", "<Ctrl>F", "slash", NULL,
446-- "win.find-next", "<Ctrl>G", NULL,
447-- "win.find-previous", "<Ctrl><Shift>G", NULL,
448-- "win.select-page", "<Ctrl>L", NULL,
449-- "win.go-backward", "<Shift>Page_Up", NULL,
450-- "win.go-forward", "<Shift>Page_Down", NULL,
451-- "win.go-next-page", "n", NULL,
452-- "win.go-previous-page", "p", NULL,
453-- "win.sizing-mode::fit-page", "f", NULL,
454-- "win.sizing-mode::fit-width", "w", NULL,
455-- "win.open-menu", "F10", NULL,
456-- "win.caret-navigation", "F7", NULL,
457-- "win.zoom-in", "plus", "<Ctrl>plus", "KP_Add", "<Ctrl>KP_Add", NULL,
458-- "win.zoom-out", "minus", "<Ctrl>minus", "KP_Subtract", "<Ctrl>KP_Subtract", NULL,
459-- "win.show-side-pane", "F9", NULL,
460-- "win.fullscreen", "F11", NULL,
461-- "win.presentation", "F5", NULL,
462-- "win.rotate-left", "<Ctrl>Left", NULL,
463-- "win.rotate-right", "<Ctrl>Right", NULL,
464-- "win.inverted-colors", "<Ctrl>I", NULL,
465-- "win.reload", "<Ctrl>R", NULL,
466-- NULL
467-- };
468--
469- EvApplication *application = EV_APPLICATION (gapplication);
470- GtkBuilder *builder;
471- GError *error = NULL;
472-- const gchar **it;
473-
474- G_APPLICATION_CLASS (ev_application_parent_class)->startup (gapplication);
475-
476-@@ -1184,18 +1146,15 @@
477- gtk_builder_add_from_resource (builder, "/org/gnome/evince/shell/ui/menus.ui", &error);
478- g_assert_no_error (error);
479-
480-+ gtk_application_add_accelerator (GTK_APPLICATION (application), "<Ctrl>F", "win.find", NULL);
481-+
482- gtk_application_set_app_menu (GTK_APPLICATION (application),
483- G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu")));
484- }
485-
486-- g_object_unref (builder);
487-+ gtk_application_add_accelerator (GTK_APPLICATION (application), "F7", "win.caret-navigation", NULL);
488-
489-- it = action_accels;
490-- while (it[0])
491-- {
492-- gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]);
493-- it += g_strv_length ((gchar **) it) + 1;
494-- }
495-+ g_object_unref (builder);
496- }
497-
498- static void
499-Index: evince-3.10.3/shell/menus.ui
500-===================================================================
501---- evince-3.10.3.orig/shell/menus.ui 2014-02-07 14:01:07.235558100 +0000
502-+++ evince-3.10.3/shell/menus.ui 2014-02-07 14:02:04.683556047 +0000
503-@@ -23,6 +23,7 @@
504- <item>
505- <attribute name="label" translatable="yes">_Open</attribute>
506- <attribute name="action">app.open</attribute>
507-+ <attribute name="accel">&lt;Ctrl&gt;O</attribute>
508- </item>
509- </section>
510- <section>
511-@@ -33,6 +34,7 @@
512- <item>
513- <attribute name="label" translatable="yes">_Help</attribute>
514- <attribute name="action">app.help</attribute>
515-+ <attribute name="accel">F1</attribute>
516- </item>
517- </section>
518- </menu>
519-@@ -52,36 +54,43 @@
520- <item>
521- <attribute name="label" translatable="yes">Side _Pane</attribute>
522- <attribute name="action">win.show-side-pane</attribute>
523-+ <attribute name="accel">F9</attribute>
524- </item>
525- </section>
526- <section>
527- <item>
528- <attribute name="label" translatable="yes">_Fullscreen</attribute>
529- <attribute name="action">win.fullscreen</attribute>
530-+ <attribute name="accel">F11</attribute>
531- </item>
532- <item>
533- <attribute name="label" translatable="yes">Pre_sentation</attribute>
534- <attribute name="action">win.presentation</attribute>
535-+ <attribute name="accel">F5</attribute>
536- </item>
537- </section>
538- <section>
539- <item>
540- <attribute name="label" translatable="yes">Rotate _Left</attribute>
541- <attribute name="action">win.rotate-left</attribute>
542-+ <attribute name="accel">&lt;Ctrl&gt;Left</attribute>
543- </item>
544- <item>
545- <attribute name="label" translatable="yes">Rotate _Right</attribute>
546- <attribute name="action">win.rotate-right</attribute>
547-+ <attribute name="accel">&lt;Ctrl&gt;Right</attribute>
548- </item>
549- </section>
550- <section>
551- <item>
552- <attribute name="label" translatable="yes">Zoom _In</attribute>
553- <attribute name="action">win.zoom-in</attribute>
554-+ <attribute name="accel">&lt;Ctrl&gt;plus</attribute>
555- </item>
556- <item>
557- <attribute name="label" translatable="yes">Zoom _Out</attribute>
558- <attribute name="action">win.zoom-out</attribute>
559-+ <attribute name="accel">&lt;Ctrl&gt;minus</attribute>
560- </item>
561- </section>
562- <section>
563-@@ -92,12 +101,14 @@
564- <item>
565- <attribute name="label" translatable="yes">_Inverted Colors</attribute>
566- <attribute name="action">win.inverted-colors</attribute>
567-+ <attribute name="accel">&lt;Ctrl&gt;I</attribute>
568- </item>
569- </section>
570- <section>
571- <item>
572- <attribute name="label" translatable="yes">_Reload</attribute>
573- <attribute name="action">win.reload</attribute>
574-+ <attribute name="accel">&lt;Ctrl&gt;R</attribute>
575- </item>
576- </section>
577- </menu>
578-@@ -107,10 +118,12 @@
579- <item>
580- <attribute name="label" translatable="yes">_Open…</attribute>
581- <attribute name="action">app.open</attribute>
582-+ <attribute name="accel">&lt;Ctrl&gt;O</attribute>
583- </item>
584- <item>
585- <attribute name="label" translatable="yes">Op_en a Copy</attribute>
586- <attribute name="action">win.open-copy</attribute>
587-+ <attribute name="accel">&lt;Ctrl&gt;N</attribute>
588- </item>
589- <item>
590- <attribute name="label" translatable="yes">_Recent</attribute>
591-@@ -120,6 +133,7 @@
592- <item>
593- <attribute name="label" translatable="yes">_Save a Copy…</attribute>
594- <attribute name="action">win.save-copy</attribute>
595-+ <attribute name="accel">&lt;Ctrl&gt;S</attribute>
596- </item>
597- <item>
598- <attribute name="label" translatable="yes">Send _To…</attribute>
599-@@ -132,22 +146,26 @@
600- <item>
601- <attribute name="label" translatable="yes">_Print…</attribute>
602- <attribute name="action">win.print</attribute>
603-+ <attribute name="accel">&lt;Ctrl&gt;P</attribute>
604- </item>
605- </section>
606- <section>
607- <item>
608- <attribute name="label" translatable="yes">P_roperties…</attribute>
609- <attribute name="action">win.show-properties</attribute>
610-+ <attribute name="accel">&lt;Alt&gt;Return</attribute>
611- </item>
612- </section>
613- <section>
614- <item>
615- <attribute name="label" translatable="yes">_Copy</attribute>
616- <attribute name="action">win.copy</attribute>
617-+ <attribute name="accel">&lt;Ctrl&gt;C</attribute>
618- </item>
619- <item>
620- <attribute name="label" translatable="yes">Select _All</attribute>
621- <attribute name="action">win.select-all</attribute>
622-+ <attribute name="accel">&lt;Ctrl&gt;A</attribute>
623- </item>
624- </section>
625- <section>
626-@@ -160,22 +178,26 @@
627- <item>
628- <attribute name="label" translatable="yes">_First Page</attribute>
629- <attribute name="action">win.go-first-page</attribute>
630-+ <attribute name="accel">&lt;Ctrl&gt;Home</attribute>
631- </item>
632- <item>
633- <attribute name="label" translatable="yes">_Last Page</attribute>
634- <attribute name="action">win.go-last-page</attribute>
635-+ <attribute name="accel">&lt;Ctrl&gt;End</attribute>
636- </item>
637- </section>
638- <section id="bookmarks">
639- <item>
640- <attribute name="label" translatable="yes">_Add Bookmark</attribute>
641- <attribute name="action">win.add-bookmark</attribute>
642-+ <attribute name="accel">&lt;Ctrl&gt;D</attribute>
643- </item>
644- </section>
645- <section>
646- <item>
647- <attribute name="label" translatable="yes">_Close</attribute>
648- <attribute name="action">win.close</attribute>
649-+ <attribute name="accel">&lt;Ctrl&gt;W</attribute>
650- </item>
651- </section>
652- <section>
653
654=== modified file 'debian/patches/series'
655--- debian/patches/series 2014-02-04 15:40:21 +0000
656+++ debian/patches/series 2014-02-10 17:52:12 +0000
657@@ -1,4 +1,4 @@
658 11_grip_gestures.patch
659 git_Don-t-allow-Send-To-when-there-is-no-mail-client-ava.patch
660 0001-Port-to-GMenuModel-and-add-menu-bar.patch
661-0002-Remove-gtk_application_set_accels_for_actions.patch
662+0002-Don-t-use-gtk_application_set_accels_for_action.patch

Subscribers

People subscribed via source and target branches

to all changes: