~ubuntu-branches/ubuntu/trusty/evince/trusty-proposed
» Revision
195
: debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch
« back to all changes in this revision
Viewing changes to debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch
- browse files at revision 195
- compare with another revision
- download diff
- download tarball
- view history from revision 195
- Committer: Package Import Robot
- Author(s): Sebastien Bacher
- Date: 2014-02-11 17:02:46 UTC
- Revision ID: package-import@ubuntu.com-20140211170246-gjhv6ov53mu6nhcy
Tags: 3.10.3-0ubuntu6
Restore working keybindings under non unity sessions,
thanks Lars Uebernickel (lp: #1277370)
thanks Lars Uebernickel (lp: #1277370)
- files added:
- .pc/0002-Don-t-use-gtk_application_set_accels_for_action.patch
- .pc/0002-Don-t-use-gtk_application_set_accels_for_action.patch/shell
- files removed:
- .pc/0002-Remove-gtk_application_set_accels_for_actions.patch
- .pc/0002-Remove-gtk_application_set_accels_for_actions.patch/shell
- files modified:
- .pc/applied-patches
added
removed
debian/patches/0001-Port-to-GMenuModel-and-add-menu-bar.patch
30
30
31
31
Index: 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 +0000
34
+++ evince-3.10.3/shell/Makefile.am 2014-02-07 16:21:43.317330332 +0000
33
--- 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-10 17:35:01.050434692 +0100
35
35
@@ -75,6 +75,8 @@
36
36
ev-sidebar-page.h \
37
37
ev-sidebar-thumbnails.c \
59
59
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate-source --c-name ev $<
60
60
Index: 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 +0000
63
+++ evince-3.10.3/shell/ev-application.c 2014-02-07 16:21:44.000000000 +0000
62
--- 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-10 17:35:15.000000000 +0100
64
64
@@ -42,6 +42,9 @@
65
65
#include "ev-application.h"
66
66
#include "ev-file-helpers.h"
447
447
+}
448
448
Index: 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 +0000
451
+++ evince-3.10.3/shell/ev-application.h 2014-02-07 16:21:43.317330332 +0000
450
--- 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-10 17:35:01.054434692 +0100
452
452
@@ -81,6 +81,14 @@
453
453
GdkScreen *screen,
454
454
const char *topic);
466
466
#endif /* !EV_APPLICATION_H */
467
467
Index: 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 +0000
470
+++ evince-3.10.3/shell/ev-bookmarks.c 2014-02-07 16:21:43.317330332 +0000
469
--- 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-10 17:35:01.054434692 +0100
471
471
@@ -224,6 +224,14 @@
472
472
return g_list_copy (bookmarks->items);
473
473
}
485
485
EvBookmark *bookmark)
486
486
Index: 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 +0000
489
+++ evince-3.10.3/shell/ev-bookmarks.h 2014-02-07 16:21:43.317330332 +0000
488
--- 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-10 17:35:01.054434692 +0100
490
490
@@ -43,6 +43,7 @@
491
491
GType ev_bookmarks_get_type (void) G_GNUC_CONST;
492
492
EvBookmarks *ev_bookmarks_new (EvMetadata *metadata);
498
498
Index: evince-3.10.3/shell/ev-recent-menu-model.c
499
499
===================================================================
500
500
--- /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 +0000
501
+++ evince-3.10.3/shell/ev-recent-menu-model.c 2014-02-10 17:35:01.054434692 +0100
502
502
@@ -0,0 +1,108 @@
503
503
+/*
504
504
+ * Copyright 2014 Canonical Ltd
611
611
Index: evince-3.10.3/shell/ev-recent-menu-model.h
612
612
===================================================================
613
613
--- /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 +0000
614
+++ evince-3.10.3/shell/ev-recent-menu-model.h 2014-02-10 17:35:01.058434692 +0100
615
615
@@ -0,0 +1,30 @@
616
616
+/*
617
617
+ * Copyright 2014 Canonical Ltd
645
645
+#endif
646
646
Index: 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 +0000
649
+++ evince-3.10.3/shell/ev-sidebar-bookmarks.c 2014-02-07 16:21:43.321330332 +0000
648
--- 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-10 17:35:01.058434692 +0100
650
650
@@ -40,11 +40,6 @@
651
651
N_COLUMNS
652
652
};
716
716
GtkWidget *
717
717
Index: 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 +0000
720
+++ evince-3.10.3/shell/ev-toolbar.c 2014-02-07 16:21:43.321330332 +0000
719
--- 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-10 17:35:01.058434692 +0100
721
721
@@ -24,9 +24,12 @@
722
722
723
723
#include "ev-toolbar.h"
984
984
static void
985
985
Index: 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 +0000
988
+++ evince-3.10.3/shell/ev-utils.c 2014-02-07 16:21:43.321330332 +0000
987
--- 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-10 17:35:39.610433331 +0100
989
989
@@ -22,6 +22,7 @@
990
990
991
991
#include "ev-utils.h"
994
994
995
995
#include <string.h>
996
996
#include <math.h>
997
@@ -391,3 +392,91 @@
997
@@ -391,3 +392,90 @@
998
998
g_slist_free (pixbuf_formats);
999
999
return NULL;
1000
1000
}
1084
1084
+ }
1085
1085
+
1086
1086
+ g_free (folder_uri);
1087
+ g_free (parent_uri);
1088
1087
+}
1089
1088
Index: 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 +0000
1092
+++ evince-3.10.3/shell/ev-utils.h 2014-02-07 16:21:43.321330332 +0000
1090
--- evince-3.10.3.orig/shell/ev-utils.h 2014-02-10 17:35:01.074434692 +0100
1091
+++ evince-3.10.3/shell/ev-utils.h 2014-02-10 17:35:01.058434692 +0100
1093
1092
@@ -42,6 +42,13 @@
1094
1093
void file_chooser_dialog_add_writable_pixbuf_formats (GtkFileChooser *chooser);
1095
1094
GdkPixbufFormat* get_gdk_pixbuf_format_by_extension (const gchar *uri);
1106
1105
#endif /* __EV_VIEW_H__ */
1107
1106
Index: 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 +0000
1110
+++ evince-3.10.3/shell/ev-window.c 2014-02-07 16:21:43.325330332 +0000
1108
--- evince-3.10.3.orig/shell/ev-window.c 2014-02-10 17:35:01.074434692 +0100
1109
+++ evince-3.10.3/shell/ev-window.c 2014-02-10 17:35:01.066434692 +0100
1111
1110
@@ -87,10 +87,10 @@
1112
1111
#include "ev-print-operation.h"
1113
1112
#include "ev-progress-message-area.h"
3382
3381
+}
3383
3382
Index: 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 +0000
3386
+++ evince-3.10.3/shell/ev-window.h 2014-02-07 16:21:43.325330332 +0000
3384
--- evince-3.10.3.orig/shell/ev-window.h 2014-02-10 17:35:01.074434692 +0100
3385
+++ evince-3.10.3/shell/ev-window.h 2014-02-10 17:35:01.066434692 +0100
3387
3386
@@ -89,7 +89,7 @@
3388
3387
GtkUIManager *ev_window_get_ui_manager (EvWindow *ev_window);
3389
3388
GtkActionGroup *ev_window_get_main_action_group (EvWindow *ev_window);
3395
3394
3396
3395
Index: 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 +0000
3399
+++ evince-3.10.3/shell/evince-appmenu.ui 2014-02-07 16:21:43.325330332 +0000
3397
--- evince-3.10.3.orig/shell/evince-appmenu.ui 2014-02-10 17:35:01.074434692 +0100
3398
+++ evince-3.10.3/shell/evince-appmenu.ui 2014-02-10 17:35:01.066434692 +0100
3400
3399
@@ -20,6 +20,16 @@
3401
3400
<menu id="appmenu">
3402
3401
<section>
3416
3415
<attribute name="accel">F1</attribute>
3417
3416
Index: 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 +0000
3420
+++ evince-3.10.3/shell/evince-ui.xml 2014-02-07 16:21:43.329330332 +0000
3418
--- evince-3.10.3.orig/shell/evince-ui.xml 2014-02-10 17:35:01.074434692 +0100
3419
+++ evince-3.10.3/shell/evince-ui.xml 2014-02-10 17:35:01.066434692 +0100
3421
3420
@@ -1,70 +1,10 @@
3422
3421
<ui>
3423
3422
- <popup name="ActionMenu" accelerators="true">
3531
3530
</ui>
3532
3531
Index: 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 +0000
3535
+++ evince-3.10.3/shell/evince.gresource.xml 2014-02-07 16:21:43.329330332 +0000
3533
--- evince-3.10.3.orig/shell/evince.gresource.xml 2014-02-10 17:35:01.074434692 +0100
3534
+++ evince-3.10.3/shell/evince.gresource.xml 2014-02-10 17:35:01.066434692 +0100
3536
3535
@@ -19,6 +19,7 @@
3537
3536
<gresource prefix="/org/gnome/evince/shell">
3538
3537
<file alias="ui/evince.xml" compressed="true" preprocess="xml-stripblanks">evince-ui.xml</file>
3545
3544
Index: evince-3.10.3/shell/menus.ui
3546
3545
===================================================================
3547
3546
--- /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 +0000
3547
+++ evince-3.10.3/shell/menus.ui 2014-02-10 17:35:15.000000000 +0100
3549
3548
@@ -0,0 +1,188 @@
3550
3549
+<?xml version="1.0" encoding="UTF-8"?>
3551
3550
+<!--
3738
3737
Index: evince-3.10.3/shell/traditional-menus.ui
3739
3738
===================================================================
3740
3739
--- /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 +0000
3740
+++ evince-3.10.3/shell/traditional-menus.ui 2014-02-10 17:35:01.066434692 +0100
3742
3741
@@ -0,0 +1,230 @@
3743
3742
+<?xml version="1.0" encoding="UTF-8"?>
3744
3743
+<!--
3972
3971
+</interface>
3973
3972
Index: 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 +0000
3976
+++ evince-3.10.3/po/POTFILES.in 2014-02-07 16:21:43.329330332 +0000
3974
--- evince-3.10.3.orig/po/POTFILES.in 2014-02-10 17:35:01.074434692 +0100
3975
+++ evince-3.10.3/po/POTFILES.in 2014-02-10 17:35:01.066434692 +0100
3977
3976
@@ -56,3 +56,6 @@
3978
3977
shell/ev-window-title.c
3979
3978
shell/main.c
Loggerhead is a web-based interface for Breezy
Version: 2.0.1