Merge lp:~larsu/eog/lp1330117 into lp:~ubuntu-desktop/eog/ubuntu

Proposed by Lars Karlitski on 2014-06-17
Status: Merged
Merged at revision: 149
Proposed branch: lp:~larsu/eog/lp1330117
Merge into: lp:~ubuntu-desktop/eog/ubuntu
Diff against target: 52 lines (+13/-6)
2 files modified
debian/changelog (+8/-0)
debian/patches/disable-appmenu-on-unity.patch (+5/-6)
To merge this branch: bzr merge lp:~larsu/eog/lp1330117
Reviewer Review Type Date Requested Status
Sebastien Bacher 2014-06-17 Approve on 2014-06-18
Review via email: mp+223451@code.launchpad.net

Commit message

debian/patches/disable-appmenu-on-unity.patch: chain up to GtkApplication's startup handler before calling gtk_application_set_app_menu() (lp: #1330117)

Description of the change

debian/patches/disable-appmenu-on-unity.patch:
chain up to GtkApplication's startup handler before calling gtk_application_set_app_menu() (lp: #1330117)

To post a comment you must log in.
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/changelog'
2--- debian/changelog 2014-03-11 11:40:35 +0000
3+++ debian/changelog 2014-06-17 17:22:16 +0000
4@@ -1,3 +1,11 @@
5+eog (3.10.2-0ubuntu6) UNRELEASED; urgency=medium
6+
7+ * debian/patches/disable-appmenu-on-unity.patch:
8+ chain up to GtkApplication's startup handler before calling
9+ gtk_application_set_app_menu() (lp: #1330117)
10+
11+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com> Tue, 17 Jun 2014 19:03:09 +0200
12+
13 eog (3.10.2-0ubuntu5) trusty; urgency=medium
14
15 [ Lars Uebernickel ]
16
17=== modified file 'debian/patches/disable-appmenu-on-unity.patch'
18--- debian/patches/disable-appmenu-on-unity.patch 2014-03-11 10:44:44 +0000
19+++ debian/patches/disable-appmenu-on-unity.patch 2014-06-17 17:22:16 +0000
20@@ -4,16 +4,19 @@
21 Forwarded: doesn't make sense upstream until eog is ported to GMenuModel
22 Author: Lars Uebernickel <lars.uebernickel@canonical.com>
23 diff --git a/src/eog-application.c b/src/eog-application.c
24-index a77157a..c4f899d 100644
25+index a77157a..23fa99c 100644
26 --- a/src/eog-application.c
27 +++ b/src/eog-application.c
28-@@ -225,9 +225,19 @@ eog_application_init_app_menu (EogApplication *application)
29+@@ -225,9 +225,18 @@ eog_application_init_app_menu (EogApplication *application)
30 static void
31 eog_application_startup (GApplication *application)
32 {
33 + gboolean shows_app_menu;
34 + gboolean shows_menubar;
35 +
36+ G_APPLICATION_CLASS (eog_application_parent_class)->startup (application);
37+
38+- eog_application_init_app_menu (EOG_APPLICATION (application));
39 + g_object_get (gtk_settings_get_default (),
40 + "gtk-shell-shows-app-menu", &shows_app_menu,
41 + "gtk-shell-shows-menubar", &shows_menubar,
42@@ -21,10 +24,6 @@
43 +
44 + if (shows_app_menu && !shows_menubar)
45 + eog_application_init_app_menu (EOG_APPLICATION (application));
46-+
47- G_APPLICATION_CLASS (eog_application_parent_class)->startup (application);
48-
49-- eog_application_init_app_menu (EOG_APPLICATION (application));
50 }
51
52 static void

Subscribers

People subscribed via source and target branches

to all changes: