[geary/bug/720347-gearmenu] Only add gear menu when no app menu

[Charles Lindsay <clindsay src gnome org>]

commit 9455a70f42e88ee29c303e84ecb03c040f69a534
Author: Charles Lindsay <chaz yorba org>
Date:   Thu Dec 12 16:32:05 2013 -0800

    Only add gear menu when no app menu

 src/client/components/main-toolbar.vala |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/client/components/main-toolbar.vala b/src/client/components/main-toolbar.vala
index 1c4c949..17fc31f 100644
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@ -97,9 +97,11 @@ public class MainToolbar : PillToolbar {
         search_upgrade_progress_bar.width_request = minimum_width;
         
         // Application button.
-        insert.clear();
-        insert.add(create_menu_button("emblem-system-symbolic", application_menu, 
GearyController.ACTION_GEAR_MENU));
-        add(create_pill_buttons(insert));
+        if (!Gtk.Settings.get_default().gtk_shell_shows_app_menu) {
+            insert.clear();
+            insert.add(create_menu_button("emblem-system-symbolic", application_menu, 
GearyController.ACTION_GEAR_MENU));
+            add(create_pill_buttons(insert));
+        }
         
         set_search_placeholder_text(DEFAULT_SEARCH_TEXT);
     }