[geary/pantheon_mail: 4/32] always show app menu

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 26ded3e23f86a234a1b7931483b8b8cecb4ad18c
Author: Daniel Foré <daniel elementary io>
Date:   Wed Nov 18 13:48:50 2015 -0800

    always show app menu

 src/client/components/main-toolbar.vala |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/src/client/components/main-toolbar.vala b/src/client/components/main-toolbar.vala
index a9eeb52..66c47e9 100644
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@ -132,15 +132,12 @@ public class MainToolbar : Gtk.Box {
         conversation_header.add_end(archive_trash_delete);
         conversation_header.add_end(undo);
 #endif
-        // Application button.  If we exported an app menu, we don't need this.
-        if (!Gtk.Settings.get_default().gtk_shell_shows_app_menu) {
-            insert.clear();
-            Gtk.Menu application_menu = new Gtk.Menu.from_model(
-                GearyApplication.instance.controller.app_menu);
-            insert.add(conversation_header.create_menu_button("emblem-system-symbolic",
-                application_menu, GearyController.ACTION_GEAR_MENU));
-            conversation_header.add_end(conversation_header.create_pill_buttons(insert));
-        }
+
+        insert.clear();
+        Gtk.Menu application_menu = new Gtk.Menu.from_model (GearyApplication.instance.controller.app_menu);
+        insert.add(conversation_header.create_menu_button ("open-menu", application_menu, 
GearyController.ACTION_GEAR_MENU));
+        conversation_header.add_end (conversation_header.create_pill_buttons (insert));
+
 #if GTK_3_12
         conversation_header.add_end(undo);
         conversation_header.add_end(archive_trash_delete);