Mail

Merge lp:~elementary-apps/pantheon-mail/appmenu into lp:~elementary-apps/pantheon-mail/trunk

  1. appmenu
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Nathan Dyer
Approved revision: 1867
Merged at revision: 1869
Proposed branch: lp:~elementary-apps/pantheon-mail/appmenu
Merge into: lp:~elementary-apps/pantheon-mail/trunk
Diff against target: 25 lines (+6/-9)
1 file modified
src/client/components/main-toolbar.vala (+6/-9)
To merge this branch: bzr merge lp:~elementary-apps/pantheon-mail/appmenu
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+277921@code.launchpad.net

Commit message

always show app menu

To post a comment you must log in.
lp:~elementary-apps/pantheon-mail/appmenu updated
1866. By Danielle Foré

yorba codestyle

1867. By Danielle Foré

merge trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/client/components/main-toolbar.vala'
2--- src/client/components/main-toolbar.vala 2015-03-20 22:50:31 +0000
3+++ src/client/components/main-toolbar.vala 2015-11-18 22:07:45 +0000
4@@ -132,15 +132,12 @@
5 conversation_header.add_end(archive_trash_delete);
6 conversation_header.add_end(undo);
7 #endif
8- // Application button. If we exported an app menu, we don't need this.
9- if (!Gtk.Settings.get_default().gtk_shell_shows_app_menu) {
10- insert.clear();
11- Gtk.Menu application_menu = new Gtk.Menu.from_model(
12- GearyApplication.instance.controller.app_menu);
13- insert.add(conversation_header.create_menu_button("emblem-system-symbolic",
14- application_menu, GearyController.ACTION_GEAR_MENU));
15- conversation_header.add_end(conversation_header.create_pill_buttons(insert));
16- }
17+
18+ insert.clear();
19+ Gtk.Menu application_menu = new Gtk.Menu.from_model(GearyApplication.instance.controller.app_menu);
20+ insert.add(conversation_header.create_menu_button("open-menu", application_menu, GearyController.ACTION_GEAR_MENU));
21+ conversation_header.add_end(conversation_header.create_pill_buttons(insert));
22+
23 #if GTK_3_12
24 conversation_header.add_end(undo);
25 conversation_header.add_end(archive_trash_delete);

Subscribers

People subscribed via source and target branches