[geary: 1/2] Fix close button in composer

[Michael Gratton <mjog src gnome org>]

commit f6e4109c6e6952eda5c985a207a534e052ef9854
Author: James Westman <flyingpimonster gmail com>
Date:   Fri Jan 3 23:45:25 2020 -0600

    Fix close button in composer
    
    In ccb11359, the composer headerbar was set to have a close button by
    default. This caused the reply composer to have a close button that
    would close the entire window. This commit reverts that part of
    ccb11359.

 src/client/composer/composer-window.vala | 2 +-
 ui/composer-headerbar.ui                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/src/client/composer/composer-window.vala b/src/client/composer/composer-window.vala
index 1608fbd0..4e77d8c4 100644
--- a/src/client/composer/composer-window.vala
+++ b/src/client/composer/composer-window.vala
@@ -42,9 +42,9 @@ public class Composer.Window : Gtk.ApplicationWindow, Container {
 
         this.composer.update_window_title();
         if (application.config.desktop_environment == UNITY) {
-            composer.header.show_close_button = false;
             composer.embed_header();
         } else {
+            composer.header.show_close_button = true;
             set_titlebar(this.composer.header);
         }
 
diff --git a/ui/composer-headerbar.ui b/ui/composer-headerbar.ui
index a088e465..930854f0 100644
--- a/ui/composer-headerbar.ui
+++ b/ui/composer-headerbar.ui
@@ -5,7 +5,6 @@
   <template class="ComposerHeaderbar" parent="GtkHeaderBar">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="show_close_button">True</property>
     <child>
       <object class="GtkBox" id="detach_start">
         <property name="visible">True</property>