Merge lp:~elementary-os/elementaryos/epiphany-gnome-menu-remove into lp:~elementary-os/elementaryos/os-patch-epiphany-browser-xenial

Proposed by Danielle Foré
Status: Merged
Merged at revision: 8
Proposed branch: lp:~elementary-os/elementaryos/epiphany-gnome-menu-remove
Merge into: lp:~elementary-os/elementaryos/os-patch-epiphany-browser-xenial
Diff against target: 29 lines (+14/-0)
2 files modified
debian/patches/99_gnome_menu_remove.patch (+13/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~elementary-os/elementaryos/epiphany-gnome-menu-remove
Reviewer Review Type Date Requested Status
elementary OS team Pending
Review via email: mp+299711@code.launchpad.net

Commit message

Remove GNOME Shell App menu

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/99_gnome_menu_remove.patch'
2--- debian/patches/99_gnome_menu_remove.patch 1970-01-01 00:00:00 +0000
3+++ debian/patches/99_gnome_menu_remove.patch 2016-07-11 16:16:32 +0000
4@@ -0,0 +1,13 @@
5+Index: os-patch-epiphany-browser-xenial/src/ephy-shell.c
6+===================================================================
7+--- os-patch-epiphany-browser-xenial.orig/src/ephy-shell.c
8++++ os-patch-epiphany-browser-xenial/src/ephy-shell.c
9+@@ -337,8 +337,6 @@ ephy_shell_startup (GApplication* applic
10+ gtk_builder_add_from_resource (builder,
11+ "/org/gnome/epiphany/epiphany-application-menu.ui",
12+ NULL);
13+- gtk_application_set_app_menu (GTK_APPLICATION (application),
14+- G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
15+ g_object_unref (builder);
16+ }
17+ }
18
19=== modified file 'debian/patches/series'
20--- debian/patches/series 2016-06-10 20:53:01 +0000
21+++ debian/patches/series 2016-07-11 16:16:32 +0000
22@@ -5,6 +5,7 @@
23 99_css_rename_incognito_class.patch
24 99_desktop_add_new_window_action.patch
25 99_desktop_rename_epiphany.patch
26+99_gnome_menu_remove.patch
27 99_location_add_margin.patch
28 99_menu_add_edit_bookmarks.patch
29 99_menu_add_new_incognito_window.patch

Subscribers

People subscribed via source and target branches

to all changes: