Evince

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

  1. lp1313250
  2. Merge into ubuntu
Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 242
Merged at revision: 243
Proposed branch: lp:~larsu/evince/lp1313250
Merge into: lp:~ubuntu-desktop/evince/ubuntu
Diff against target: 871 lines (+111/-106)
1 file modified
debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch (+111/-106)
To merge this branch: bzr merge lp:~larsu/evince/lp1313250
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+217440@code.launchpad.net

Commit message

Reenable Ctrl+L accel to focus page selector

Description of the change

Reenable Ctrl+L accel to focus page selector

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-03-11 16:16:33 +0000
3+++ debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch 2014-04-28 13:35:25 +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-03-11 17:15:56.533258733 +0100
9-+++ evince-3.10.3/shell/Makefile.am 2014-03-11 17:15:56.517258733 +0100
10+--- evince-3.10.3.orig/shell/Makefile.am 2014-04-28 15:33:25.038869346 +0200
11++++ evince-3.10.3/shell/Makefile.am 2014-04-28 15:33:25.022869346 +0200
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-03-11 17:15:56.533258733 +0100
20-+++ evince-3.10.3/shell/ev-application.c 2014-03-11 17:16:13.333258985 +0100
21+--- evince-3.10.3.orig/shell/ev-application.c 2014-04-28 15:33:25.038869346 +0200
22++++ evince-3.10.3/shell/ev-application.c 2014-04-28 15:33:30.000000000 +0200
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-03-11 17:15:56.533258733 +0100
31-+++ evince-3.10.3/shell/ev-application.h 2014-03-11 17:15:56.521258733 +0100
32+--- evince-3.10.3.orig/shell/ev-application.h 2014-04-28 15:33:25.038869346 +0200
33++++ evince-3.10.3/shell/ev-application.h 2014-04-28 15:33:25.022869346 +0200
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-03-11 17:15:56.533258733 +0100
42-+++ evince-3.10.3/shell/ev-bookmarks.c 2014-03-11 17:15:56.521258733 +0100
43+--- evince-3.10.3.orig/shell/ev-bookmarks.c 2014-04-28 15:33:25.038869346 +0200
44++++ evince-3.10.3/shell/ev-bookmarks.c 2014-04-28 15:33:25.026869346 +0200
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-03-11 17:15:56.533258733 +0100
53-+++ evince-3.10.3/shell/ev-bookmarks.h 2014-03-11 17:15:56.521258733 +0100
54+--- evince-3.10.3.orig/shell/ev-bookmarks.h 2014-04-28 15:33:25.038869346 +0200
55++++ evince-3.10.3/shell/ev-bookmarks.h 2014-04-28 15:33:25.026869346 +0200
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-03-11 17:15:56.521258733 +0100
64++++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-04-28 15:33:25.026869346 +0200
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-03-11 17:15:56.521258733 +0100
73++++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-04-28 15:33:25.026869346 +0200
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-03-11 17:15:56.533258733 +0100
82-+++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-03-11 17:15:56.521258733 +0100
83+--- evince-3.10.3.orig/shell/ev-sidebar-bookmarks.c 2014-04-28 15:33:25.038869346 +0200
84++++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-04-28 15:33:25.026869346 +0200
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-03-11 17:15:56.533258733 +0100
93-+++ evince-3.10.3/shell/ev-toolbar.c 2014-03-11 17:15:56.521258733 +0100
94+--- evince-3.10.3.orig/shell/ev-toolbar.c 2014-04-28 15:33:25.038869346 +0200
95++++ evince-3.10.3/shell/ev-toolbar.c 2014-04-28 15:33:25.026869346 +0200
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-03-11 17:15:56.533258733 +0100
104-+++ evince-3.10.3/shell/ev-utils.c 2014-03-11 17:15:56.521258733 +0100
105+--- evince-3.10.3.orig/shell/ev-utils.c 2014-04-28 15:33:25.038869346 +0200
106++++ evince-3.10.3/shell/ev-utils.c 2014-04-28 15:33:25.030869346 +0200
107 @@ -22,6 +22,7 @@
108
109 #include "ev-utils.h"
110@@ -1087,8 +1087,8 @@
111 +}
112 Index: evince-3.10.3/shell/ev-utils.h
113 ===================================================================
114---- evince-3.10.3.orig/shell/ev-utils.h 2014-03-11 17:15:56.533258733 +0100
115-+++ evince-3.10.3/shell/ev-utils.h 2014-03-11 17:15:56.521258733 +0100
116+--- evince-3.10.3.orig/shell/ev-utils.h 2014-04-28 15:33:25.038869346 +0200
117++++ evince-3.10.3/shell/ev-utils.h 2014-04-28 15:33:25.030869346 +0200
118 @@ -42,6 +42,13 @@
119 void file_chooser_dialog_add_writable_pixbuf_formats (GtkFileChooser *chooser);
120 GdkPixbufFormat* get_gdk_pixbuf_format_by_extension (const gchar *uri);
121@@ -1105,8 +1105,8 @@
122 #endif /* __EV_VIEW_H__ */
123 Index: evince-3.10.3/shell/ev-window.c
124 ===================================================================
125---- evince-3.10.3.orig/shell/ev-window.c 2014-03-11 17:15:56.533258733 +0100
126-+++ evince-3.10.3/shell/ev-window.c 2014-03-11 17:15:56.525258733 +0100
127+--- evince-3.10.3.orig/shell/ev-window.c 2014-04-28 15:33:25.038869346 +0200
128++++ evince-3.10.3/shell/ev-window.c 2014-04-28 15:33:37.626869432 +0200
129 @@ -87,10 +87,10 @@
130 #include "ev-print-operation.h"
131 #include "ev-progress-message-area.h"
132@@ -1906,7 +1906,7 @@
133 break;
134 case GTK_RESPONSE_NO:
135 gtk_widget_destroy (GTK_WIDGET (ev_window));
136-@@ -3823,64 +3503,81 @@
137+@@ -3823,64 +3503,86 @@
138 }
139
140 static void
141@@ -1930,6 +1930,7 @@
142 - GtkAction *action;
143 -
144 + EvWindow *window = user_data;
145++ GtkAction *page_action;
146 +
147 update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, TRUE);
148 update_chrome_visibility (window);
149@@ -1937,6 +1938,10 @@
150 - action = gtk_action_group_get_action (window->priv->action_group,
151 - PAGE_SELECTOR_ACTION);
152 - ev_page_action_grab_focus (EV_PAGE_ACTION (action));
153++
154++ page_action = gtk_action_group_get_action (window->priv->action_group,
155++ PAGE_SELECTOR_ACTION);
156++ ev_page_action_grab_focus (EV_PAGE_ACTION (page_action));
157 }
158
159 static void
160@@ -2012,7 +2017,7 @@
161 }
162
163 static void
164-@@ -3897,9 +3594,27 @@
165+@@ -3897,9 +3599,27 @@
166 }
167
168 static void
169@@ -2043,7 +2048,7 @@
170 }
171
172 static void
173-@@ -3916,12 +3631,6 @@
174+@@ -3916,12 +3636,6 @@
175 }
176
177 static void
178@@ -2056,7 +2061,7 @@
179 ev_window_cmd_view_zoom_automatic (GtkAction *action,
180 EvWindow *ev_window)
181 {
182-@@ -3957,29 +3666,28 @@
183+@@ -3957,29 +3671,28 @@
184 }
185
186 static void
187@@ -2096,7 +2101,7 @@
188 }
189
190 static void
191-@@ -4004,8 +3712,11 @@
192+@@ -4004,8 +3717,11 @@
193 }
194
195 static void
196@@ -2109,7 +2114,7 @@
197 gboolean find_bar_hidden;
198
199 if (EV_WINDOW_IS_PRESENTATION (ev_window))
200-@@ -4029,8 +3740,11 @@
201+@@ -4029,8 +3745,11 @@
202 }
203
204 static void
205@@ -2122,7 +2127,7 @@
206 gboolean find_bar_hidden;
207
208 if (EV_WINDOW_IS_PRESENTATION (ev_window))
209-@@ -4047,9 +3761,11 @@
210+@@ -4047,9 +3766,11 @@
211 }
212
213 static void
214@@ -2136,7 +2141,7 @@
215
216 ev_view_copy (EV_VIEW (ev_window->priv->view));
217 }
218-@@ -4067,15 +3783,12 @@
219+@@ -4067,15 +3788,12 @@
220 static void
221 ev_window_update_fullscreen_action (EvWindow *window)
222 {
223@@ -2157,7 +2162,7 @@
224 }
225
226 static void
227-@@ -4292,16 +4005,19 @@
228+@@ -4292,16 +4010,19 @@
229 }
230
231 static void
232@@ -2181,7 +2186,7 @@
233 }
234
235 static void
236-@@ -4336,15 +4052,11 @@
237+@@ -4336,15 +4057,11 @@
238 static void
239 ev_window_update_presentation_action (EvWindow *window)
240 {
241@@ -2201,7 +2206,7 @@
242 }
243
244 static void
245-@@ -4459,14 +4171,17 @@
246+@@ -4459,14 +4176,17 @@
247 }
248
249 static void
250@@ -2223,7 +2228,7 @@
251 }
252
253 static gboolean
254-@@ -4530,10 +4245,12 @@
255+@@ -4530,10 +4250,12 @@
256 ev_window_update_actions_sensitivity (window);
257 }
258
259@@ -2238,7 +2243,7 @@
260 gint rotation;
261
262 if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
263-@@ -4548,8 +4265,11 @@
264+@@ -4548,8 +4270,11 @@
265 }
266
267 static void
268@@ -2251,7 +2256,7 @@
269 gint rotation;
270
271 if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
272-@@ -4564,16 +4284,23 @@
273+@@ -4564,16 +4289,23 @@
274 }
275
276 static void
277@@ -2279,7 +2284,7 @@
278 EvWindowPrivate *priv = ev_window->priv;
279 EvDocumentModel *model = priv->model;
280 GSettings *settings = priv->default_settings;
281-@@ -4582,7 +4309,7 @@
282+@@ -4582,7 +4314,7 @@
283 g_settings_set_boolean (settings, "continuous",
284 ev_document_model_get_continuous (model));
285 g_settings_set_boolean (settings, "dual-page",
286@@ -2288,7 +2293,7 @@
287 g_settings_set_boolean (settings, "dual-page-odd-left",
288 ev_document_model_get_dual_page_odd_pages_left (model));
289 g_settings_set_boolean (settings, "fullscreen",
290-@@ -4607,59 +4334,78 @@
291+@@ -4607,59 +4339,78 @@
292 }
293
294 static void
295@@ -2385,7 +2390,7 @@
296 int n_pages, current_page;
297
298 g_return_if_fail (EV_IS_WINDOW (ev_window));
299-@@ -4673,11 +4419,14 @@
300+@@ -4673,11 +4424,14 @@
301 }
302
303 static void
304@@ -2403,7 +2408,7 @@
305
306 current_page = ev_document_model_get_page (ev_window->priv->model);
307
308-@@ -4686,15 +4435,6 @@
309+@@ -4686,15 +4440,6 @@
310 }
311 }
312
313@@ -2419,7 +2424,7 @@
314 static gint
315 compare_bookmarks (EvBookmark *a,
316 EvBookmark *b)
317-@@ -4705,59 +4445,33 @@
318+@@ -4705,59 +4450,33 @@
319 static void
320 ev_window_setup_bookmarks (EvWindow *window)
321 {
322@@ -2494,7 +2499,7 @@
323 EvBookmark bm;
324 gchar *page_label;
325
326-@@ -4771,32 +4485,41 @@
327+@@ -4771,32 +4490,41 @@
328 }
329
330 static void
331@@ -2548,7 +2553,7 @@
332 ev_view_autoscroll_stop (EV_VIEW (window->priv->view));
333
334 if (gtk_widget_get_visible (window->priv->find_bar))
335-@@ -4890,29 +4613,20 @@
336+@@ -4890,29 +4618,20 @@
337 }
338
339 static void
340@@ -2586,7 +2591,7 @@
341 }
342
343 static void
344-@@ -4930,27 +4644,16 @@
345+@@ -4930,27 +4649,16 @@
346 }
347
348 static void
349@@ -2618,7 +2623,7 @@
350
351 if (window->priv->metadata && !ev_window_is_empty (window))
352 ev_metadata_set_boolean (window->priv->metadata, "inverted-colors",
353-@@ -4960,43 +4663,20 @@
354+@@ -4960,43 +4668,20 @@
355 }
356
357 static void
358@@ -2669,7 +2674,7 @@
359 }
360
361 static void
362-@@ -5004,119 +4684,36 @@
363+@@ -5004,119 +4689,36 @@
364 GParamSpec *pspec,
365 EvWindow *ev_window)
366 {
367@@ -2804,7 +2809,7 @@
368 update_chrome_visibility (ev_window);
369 }
370
371-@@ -5137,14 +4734,11 @@
372+@@ -5137,14 +4739,11 @@
373 GParamSpec *pspec,
374 EvWindow *ev_window)
375 {
376@@ -2821,7 +2826,7 @@
377
378 if (ev_window->priv->metadata)
379 ev_metadata_set_boolean (ev_window->priv->metadata, "sidebar_visibility",
380-@@ -5154,14 +4748,10 @@
381+@@ -5154,14 +4753,10 @@
382 }
383 }
384
385@@ -2837,7 +2842,7 @@
386 if (ev_window->priv->link)
387 g_object_unref (ev_window->priv->link);
388
389-@@ -5178,42 +4768,23 @@
390+@@ -5178,42 +4773,23 @@
391 switch (ev_link_action_get_action_type (ev_action)) {
392 case EV_LINK_ACTION_TYPE_GOTO_DEST:
393 case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
394@@ -2887,7 +2892,7 @@
395 if (ev_window->priv->image)
396 g_object_unref (ev_window->priv->image);
397
398-@@ -5222,38 +4793,22 @@
399+@@ -5222,38 +4798,22 @@
400 else
401 ev_window->priv->image = NULL;
402
403@@ -2928,7 +2933,7 @@
404 if (ev_window->priv->attach_list) {
405 g_list_foreach (ev_window->priv->attach_list,
406 (GFunc) g_object_unref, NULL);
407-@@ -5263,16 +4818,43 @@
408+@@ -5263,16 +4823,43 @@
409 ev_window->priv->attach_list =
410 g_list_prepend (ev_window->priv->attach_list,
411 g_object_ref (attachment));
412@@ -2979,7 +2984,7 @@
413 }
414
415 static gboolean
416-@@ -5280,34 +4862,44 @@
417+@@ -5280,34 +4867,44 @@
418 GList *items,
419 EvWindow *ev_window)
420 {
421@@ -3043,7 +3048,7 @@
422 return TRUE;
423 }
424
425-@@ -5316,8 +4908,6 @@
426+@@ -5316,8 +4913,6 @@
427 GList *attach_list,
428 EvWindow *ev_window)
429 {
430@@ -3052,7 +3057,7 @@
431 g_assert (attach_list != NULL);
432
433 if (ev_window->priv->attach_list) {
434-@@ -5325,13 +4915,19 @@
435+@@ -5325,13 +4920,19 @@
436 (GFunc) g_object_unref, NULL);
437 g_list_free (ev_window->priv->attach_list);
438 }
439@@ -3077,7 +3082,7 @@
440 3, gtk_get_current_event_time ());
441
442 return TRUE;
443-@@ -5542,21 +5138,6 @@
444+@@ -5542,21 +5143,6 @@
445 }
446
447 static void
448@@ -3099,7 +3104,7 @@
449 ev_window_show_find_bar (EvWindow *ev_window)
450 {
451 if (gtk_widget_get_visible (ev_window->priv->find_bar)) {
452-@@ -5583,7 +5164,7 @@
453+@@ -5583,7 +5169,7 @@
454 update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
455 update_chrome_visibility (ev_window);
456 gtk_widget_grab_focus (ev_window->priv->find_bar);
457@@ -3108,7 +3113,7 @@
458 }
459
460 static void
461-@@ -5601,7 +5182,7 @@
462+@@ -5601,7 +5187,7 @@
463 update_chrome_flag (ev_window, EV_CHROME_FINDBAR, FALSE);
464 update_chrome_visibility (ev_window);
465 gtk_widget_grab_focus (ev_window->priv->view);
466@@ -3117,7 +3122,7 @@
467
468 ev_history_thaw (ev_window->priv->history);
469 }
470-@@ -5651,10 +5232,15 @@
471+@@ -5651,10 +5237,15 @@
472 ev_window_set_caret_navigation_enabled (EvWindow *window,
473 gboolean enabled)
474 {
475@@ -3133,7 +3138,7 @@
476 }
477
478 static void
479-@@ -5668,7 +5254,7 @@
480+@@ -5668,7 +5259,7 @@
481
482 /* Turn the confirmation dialog off if the user has requested not to show it again */
483 if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (window->priv->ask_caret_navigation_check))) {
484@@ -3142,7 +3147,7 @@
485 g_settings_apply (window->priv->settings);
486 }
487
488-@@ -5678,9 +5264,11 @@
489+@@ -5678,9 +5269,11 @@
490 }
491
492 static void
493@@ -3156,7 +3161,7 @@
494 GtkWidget *message_area;
495 GtkWidget *box;
496 GtkWidget *hbox;
497-@@ -5689,7 +5277,7 @@
498+@@ -5689,7 +5282,7 @@
499 /* Don't ask for user confirmation to turn the caret navigation off when it is active,
500 * or to turn it on when the confirmation dialog is not to be shown per settings */
501 enabled = ev_view_is_caret_navigation_enabled (EV_VIEW (window->priv->view));
502@@ -3165,7 +3170,7 @@
503 ev_window_set_caret_navigation_enabled (window, !enabled);
504 return;
505 }
506-@@ -5793,40 +5381,24 @@
507+@@ -5793,40 +5386,24 @@
508 priv->action_group = NULL;
509 }
510
511@@ -3212,7 +3217,7 @@
512 if (priv->default_settings) {
513 g_settings_apply (priv->default_settings);
514 g_object_unref (priv->default_settings);
515-@@ -5838,8 +5410,6 @@
516+@@ -5838,8 +5415,6 @@
517 priv->lockdown_settings = NULL;
518 }
519
520@@ -3221,7 +3226,7 @@
521 if (priv->model) {
522 g_signal_handlers_disconnect_by_func (priv->model,
523 ev_window_page_changed_cb,
524-@@ -5955,7 +5525,6 @@
525+@@ -5955,7 +5530,6 @@
526 G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
527 }
528
529@@ -3229,7 +3234,7 @@
530 /*
531 * GtkWindow catches keybindings for the menu items _before_ passing them to
532 * the focused widget. This is unfortunate and means that pressing Ctrl+a,
533-@@ -6012,206 +5581,6 @@
534+@@ -6012,206 +5586,6 @@
535 g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate));
536 }
537
538@@ -3436,7 +3441,7 @@
539 static const GtkToggleActionEntry zoom_selector_popup_actions[] = {
540 { "ViewFitPage", EV_STOCK_ZOOM_PAGE, N_("Fit Pa_ge"), NULL,
541 N_("Make the current document fill the window"),
542-@@ -6276,13 +5645,6 @@
543+@@ -6276,13 +5650,6 @@
544 }
545
546 static void
547@@ -3450,7 +3455,7 @@
548 zoom_action_activated_cb (EvZoomAction *action,
549 EvWindow *window)
550 {
551-@@ -6378,42 +5740,6 @@
552+@@ -6378,42 +5745,6 @@
553 }
554
555 static void
556@@ -3493,7 +3498,7 @@
557 sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
558 GParamSpec *pspec,
559 EvWindow *ev_window)
560-@@ -6647,21 +5973,21 @@
561+@@ -6647,21 +5978,21 @@
562 const gchar *name = ev_link_action_get_name (action);
563
564 if (g_ascii_strcasecmp (name, "FirstPage") == 0) {
565@@ -3523,7 +3528,7 @@
566 } else {
567 g_warning ("Unimplemented named action: %s, please post a "
568 "bug report in Evince bugzilla "
569-@@ -6702,14 +6028,21 @@
570+@@ -6702,14 +6033,21 @@
571 }
572
573 static void
574@@ -3547,7 +3552,7 @@
575 EvLinkAction *ev_action = NULL;
576 EvLinkDest *dest;
577
578-@@ -6725,8 +6058,11 @@
579+@@ -6725,8 +6063,11 @@
580 }
581
582 static void
583@@ -3560,7 +3565,7 @@
584 EvLinkAction *ev_action;
585
586 ev_action = ev_link_get_action (window->priv->link);
587-@@ -6782,8 +6118,8 @@
588+@@ -6782,8 +6123,8 @@
589 return;
590 }
591
592@@ -3571,7 +3576,7 @@
593
594 uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
595 filter = gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (fc));
596-@@ -6862,8 +6198,11 @@
597+@@ -6862,8 +6203,11 @@
598 }
599
600 static void
601@@ -3584,7 +3589,7 @@
602 GtkWidget *fc;
603
604 if (!window->priv->image)
605-@@ -6887,9 +6226,9 @@
606+@@ -6887,9 +6231,9 @@
607 gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);
608
609 file_chooser_dialog_add_writable_pixbuf_formats (GTK_FILE_CHOOSER (fc));
610@@ -3597,7 +3602,7 @@
611
612 g_signal_connect (fc, "response",
613 G_CALLBACK (image_save_dialog_response_cb),
614-@@ -6899,8 +6238,11 @@
615+@@ -6899,8 +6243,11 @@
616 }
617
618 static void
619@@ -3610,7 +3615,7 @@
620 GtkClipboard *clipboard;
621 GdkPixbuf *pixbuf;
622
623-@@ -6919,9 +6261,11 @@
624+@@ -6919,9 +6266,11 @@
625 }
626
627 static void
628@@ -3624,7 +3629,7 @@
629 const gchar *author;
630 GdkRGBA rgba;
631 gdouble opacity;
632-@@ -6980,8 +6324,11 @@
633+@@ -6980,8 +6329,11 @@
634 }
635
636 static void
637@@ -3637,7 +3642,7 @@
638 GList *l;
639 GdkScreen *screen;
640
641-@@ -7023,8 +6370,8 @@
642+@@ -7023,8 +6375,8 @@
643 return;
644 }
645
646@@ -3648,7 +3653,7 @@
647
648 uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
649 target_file = g_file_new_for_uri (uri);
650-@@ -7089,8 +6436,11 @@
651+@@ -7089,8 +6441,11 @@
652 }
653
654 static void
655@@ -3661,7 +3666,7 @@
656 GtkWidget *fc;
657 EvAttachment *attachment = NULL;
658
659-@@ -7122,8 +6472,8 @@
660+@@ -7122,8 +6477,8 @@
661 gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc),
662 ev_attachment_get_name (attachment));
663
664@@ -3672,7 +3677,7 @@
665
666 g_signal_connect (fc, "response",
667 G_CALLBACK (attachment_save_dialog_response_cb),
668-@@ -7154,16 +6504,16 @@
669+@@ -7154,16 +6509,16 @@
670 if (EV_WINDOW_IS_PRESENTATION (window))
671 ev_view_presentation_previous_page (EV_VIEW_PRESENTATION (window->priv->presentation_view));
672 else
673@@ -3693,7 +3698,7 @@
674 }
675 }
676
677-@@ -7278,11 +6628,84 @@
678+@@ -7278,11 +6633,84 @@
679 }
680
681 static void
682@@ -3778,7 +3783,7 @@
683 GError *error = NULL;
684 GtkWidget *sidebar_widget;
685 GtkWidget *overlay;
686-@@ -7343,6 +6766,8 @@
687+@@ -7343,6 +6771,8 @@
688 G_CALLBACK (activate_link_cb),
689 ev_window);
690
691@@ -3787,7 +3792,7 @@
692 app_info = g_app_info_get_default_for_uri_scheme ("mailto");
693 ev_window->priv->has_mailto_handler = app_info != NULL;
694 g_clear_object (&app_info);
695-@@ -7351,15 +6776,13 @@
696+@@ -7351,15 +6781,13 @@
697 gtk_container_add (GTK_CONTAINER (ev_window), ev_window->priv->main_box);
698 gtk_widget_show (ev_window->priv->main_box);
699
700@@ -3807,7 +3812,7 @@
701 register_custom_actions (ev_window, action_group);
702
703 ev_window->priv->ui_manager = gtk_ui_manager_new ();
704-@@ -7370,24 +6793,6 @@
705+@@ -7370,24 +6798,6 @@
706 gtk_ui_manager_get_accel_group (ev_window->priv->ui_manager);
707 gtk_window_add_accel_group (GTK_WINDOW (ev_window), accel_group);
708
709@@ -3832,7 +3837,7 @@
710 action_group = gtk_action_group_new ("ZoomSelectorPopupActions");
711 ev_window->priv->zoom_selector_popup_action_group = action_group;
712 gtk_action_group_set_translation_domain (action_group, NULL);
713-@@ -7397,10 +6802,10 @@
714+@@ -7397,10 +6807,10 @@
715 gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
716 action_group, 0);
717
718@@ -3847,7 +3852,7 @@
719
720 ev_window_register_zoom_selector_popup_actions (ev_window);
721
722-@@ -7415,12 +6820,6 @@
723+@@ -7415,12 +6825,6 @@
724 g_object_unref (css_provider);
725
726 ev_window->priv->recent_manager = gtk_recent_manager_get_default ();
727@@ -3860,7 +3865,7 @@
728
729 ev_window->priv->toolbar = ev_toolbar_new (ev_window);
730 gtk_widget_set_no_show_all (ev_window->priv->toolbar, TRUE);
731-@@ -7526,10 +6925,6 @@
732+@@ -7526,10 +6930,6 @@
733
734 sidebar_widget = ev_sidebar_bookmarks_new ();
735 ev_window->priv->sidebar_bookmarks = sidebar_widget;
736@@ -3871,7 +3876,7 @@
737 gtk_widget_show (sidebar_widget);
738 ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
739 sidebar_widget);
740-@@ -7565,7 +6960,7 @@
741+@@ -7565,7 +6965,7 @@
742 g_object_set(ev_window->priv->view, "enable-gestures",
743 _oif_ev_application_get_gestures_enabled (EV_APP), NULL);
744 #endif
745@@ -3880,7 +3885,7 @@
746 GS_PAGE_CACHE_SIZE);
747 ev_view_set_page_cache_size (EV_VIEW (ev_window->priv->view),
748 page_cache_mb * 1024 * 1024);
749-@@ -7707,13 +7102,17 @@
750+@@ -7707,13 +7107,17 @@
751 G_CALLBACK (find_bar_visibility_changed_cb),
752 ev_window);
753
754@@ -3903,7 +3908,7 @@
755 ev_window->priv->attach_list = NULL;
756
757 /* Media player keys */
758-@@ -7731,9 +7130,6 @@
759+@@ -7731,9 +7135,6 @@
760 g_settings_delay (ev_window->priv->default_settings);
761 ev_window_setup_default (ev_window);
762
763@@ -3913,7 +3918,7 @@
764 gtk_window_set_default_size (GTK_WINDOW (ev_window), 600, 600);
765
766 ev_window_sizing_mode_changed_cb (ev_window->priv->model, NULL, ev_window);
767-@@ -7745,6 +7141,8 @@
768+@@ -7745,6 +7146,8 @@
769 NULL, 0,
770 GDK_ACTION_COPY);
771 gtk_drag_dest_add_uri_targets (GTK_WIDGET (ev_window));
772@@ -3922,7 +3927,7 @@
773 }
774
775 /**
776-@@ -7762,7 +7160,6 @@
777+@@ -7762,7 +7165,6 @@
778 ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW,
779 "type", GTK_WINDOW_TOPLEVEL,
780 "application", g_application_get_default (),
781@@ -3930,7 +3935,7 @@
782 NULL));
783
784 return ev_window;
785-@@ -7801,3 +7198,11 @@
786+@@ -7801,3 +7203,11 @@
787
788 return ev_window->priv->zoom_selector_popup_action_group;
789 }
790@@ -3944,8 +3949,8 @@
791 +}
792 Index: evince-3.10.3/shell/ev-window.h
793 ===================================================================
794---- evince-3.10.3.orig/shell/ev-window.h 2014-03-11 17:15:56.533258733 +0100
795-+++ evince-3.10.3/shell/ev-window.h 2014-03-11 17:15:56.525258733 +0100
796+--- evince-3.10.3.orig/shell/ev-window.h 2014-04-28 15:33:25.038869346 +0200
797++++ evince-3.10.3/shell/ev-window.h 2014-04-28 15:33:25.034869346 +0200
798 @@ -89,7 +89,7 @@
799 GtkUIManager *ev_window_get_ui_manager (EvWindow *ev_window);
800 GtkActionGroup *ev_window_get_main_action_group (EvWindow *ev_window);
801@@ -3957,8 +3962,8 @@
802
803 Index: evince-3.10.3/shell/evince-appmenu.ui
804 ===================================================================
805---- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-03-11 17:15:56.533258733 +0100
806-+++ evince-3.10.3/shell/evince-appmenu.ui 2014-03-11 17:15:56.525258733 +0100
807+--- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-04-28 15:33:25.038869346 +0200
808++++ evince-3.10.3/shell/evince-appmenu.ui 2014-04-28 15:33:25.034869346 +0200
809 @@ -20,6 +20,16 @@
810 <menu id="appmenu">
811 <section>
812@@ -3978,8 +3983,8 @@
813 <attribute name="accel">F1</attribute>
814 Index: evince-3.10.3/shell/evince-ui.xml
815 ===================================================================
816---- evince-3.10.3.orig/shell/evince-ui.xml 2014-03-11 17:15:56.533258733 +0100
817-+++ evince-3.10.3/shell/evince-ui.xml 2014-03-11 17:15:56.525258733 +0100
818+--- evince-3.10.3.orig/shell/evince-ui.xml 2014-04-28 15:33:25.038869346 +0200
819++++ evince-3.10.3/shell/evince-ui.xml 2014-04-28 15:33:25.034869346 +0200
820 @@ -1,86 +1,4 @@
821 <ui>
822 - <popup name="ActionMenu" accelerators="true">
823@@ -4102,8 +4107,8 @@
824 +
825 Index: evince-3.10.3/shell/evince.gresource.xml
826 ===================================================================
827---- evince-3.10.3.orig/shell/evince.gresource.xml 2014-03-11 17:15:56.533258733 +0100
828-+++ evince-3.10.3/shell/evince.gresource.xml 2014-03-11 17:15:56.525258733 +0100
829+--- evince-3.10.3.orig/shell/evince.gresource.xml 2014-04-28 15:33:25.038869346 +0200
830++++ evince-3.10.3/shell/evince.gresource.xml 2014-04-28 15:33:25.034869346 +0200
831 @@ -19,6 +19,8 @@
832 <gresource prefix="/org/gnome/evince/shell">
833 <file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>
834@@ -4117,7 +4122,7 @@
835 Index: evince-3.10.3/shell/menus.ui
836 ===================================================================
837 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
838-+++ evince-3.10.3/shell/menus.ui 2014-03-11 17:16:00.000000000 +0100
839++++ evince-3.10.3/shell/menus.ui 2014-04-28 15:33:30.000000000 +0200
840 @@ -0,0 +1,188 @@
841 +<?xml version="1.0" encoding="UTF-8"?>
842 +<!--
843@@ -4310,7 +4315,7 @@
844 Index: evince-3.10.3/shell/traditional-menus.ui
845 ===================================================================
846 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
847-+++ evince-3.10.3/shell/traditional-menus.ui 2014-03-11 17:15:56.525258733 +0100
848++++ evince-3.10.3/shell/traditional-menus.ui 2014-04-28 15:33:25.034869346 +0200
849 @@ -0,0 +1,230 @@
850 +<?xml version="1.0" encoding="UTF-8"?>
851 +<!--
852@@ -4544,8 +4549,8 @@
853 +</interface>
854 Index: evince-3.10.3/po/POTFILES.in
855 ===================================================================
856---- evince-3.10.3.orig/po/POTFILES.in 2014-03-11 17:15:56.533258733 +0100
857-+++ evince-3.10.3/po/POTFILES.in 2014-03-11 17:15:56.525258733 +0100
858+--- evince-3.10.3.orig/po/POTFILES.in 2014-04-28 15:33:25.038869346 +0200
859++++ evince-3.10.3/po/POTFILES.in 2014-04-28 15:33:25.034869346 +0200
860 @@ -56,3 +56,6 @@
861 shell/ev-window-title.c
862 shell/main.c
863@@ -4556,7 +4561,7 @@
864 Index: evince-3.10.3/shell/popup-menus.ui
865 ===================================================================
866 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
867-+++ evince-3.10.3/shell/popup-menus.ui 2014-03-11 17:15:56.525258733 +0100
868++++ evince-3.10.3/shell/popup-menus.ui 2014-04-28 15:33:25.034869346 +0200
869 @@ -0,0 +1,114 @@
870 +<?xml version="1.0" encoding="UTF-8"?>
871 +<!--

Subscribers

People subscribed via source and target branches

to all changes: