[california] Add close button back to app header bar: Bug #731316

[Jim Nelson <jnelson src gnome org>]

commit 7874c167e7e8a2eba1b414892fe6046bf918b7a9
Author: Yosef Or Boczko <yoseforb src gnome org>
Date:   Thu Jun 12 16:14:35 2014 -0700

    Add close button back to app header bar: Bug #731316
    
    Required by GNOME HIG.

 src/host/host-main-window.vala |    1 +
 src/rc/window-menu.interface   |    6 ------
 2 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/src/host/host-main-window.vala b/src/host/host-main-window.vala
index 7bed590..f542eee 100644
--- a/src/host/host-main-window.vala
+++ b/src/host/host-main-window.vala
@@ -155,6 +155,7 @@ public class MainWindow : Gtk.ApplicationWindow {
         // Unity doesn't support GtkHeaderBar-as-title-bar very well yet; when set, the main
         // window can't be resized no matter what additional GtkWindow properties are set
         set_titlebar(headerbar);
+        headerbar.show_close_button = true;
 #endif
         
         today.valign = Gtk.Align.CENTER;
diff --git a/src/rc/window-menu.interface b/src/rc/window-menu.interface
index ccd9b98..ea49c19 100644
--- a/src/rc/window-menu.interface
+++ b/src/rc/window-menu.interface
@@ -15,12 +15,6 @@
                 <attribute name="action">win.reset-font</attribute>
             </item>
         </section>
-        <section>
-            <item>
-                <attribute name="label" translatable="yes">_Quit</attribute>
-                <attribute name="action">app.quit</attribute>
-            </item>
-        </section>
     </menu>
 </interface>