From f281b5ca2e8488f0237b8b56b8f643b6d6252f02 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Tue, 26 Jan 2021 21:54:14 +1100
Subject: [PATCH] Composer.Widget: Rename some structural widgets to make more
 sense

---
 src/client/composer/composer-widget.vala | 12 ++++++------
 ui/composer-widget.ui                    |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index 5ff1922e..6b195642 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -362,9 +362,9 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
     [GtkChild]
     private Gtk.Widget visible_on_attachment_drag_over_child;
     [GtkChild]
-    private Gtk.Widget recipients;
+    private Gtk.Widget email_headers;
     [GtkChild]
-    private Gtk.Box header_area;
+    private Gtk.Box header_container;
 
     private GLib.SimpleActionGroup actions = new GLib.SimpleActionGroup();
 
@@ -1382,17 +1382,17 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
         switch (new_mode) {
         case PresentationMode.DETACHED:
         case PresentationMode.PANED:
-            this.recipients.set_visible(true);
+            this.email_headers.set_visible(true);
             this.subject_row.visible = true;
             break;
 
         case PresentationMode.INLINE:
-            this.recipients.set_visible(true);
+            this.email_headers.set_visible(true);
             this.subject_row.visible = false;
             break;
 
         case PresentationMode.INLINE_COMPACT:
-            this.recipients.set_visible(false);
+            this.email_headers.set_visible(false);
             this.subject_row.visible = false;
             set_compact_header_recipients();
             break;
@@ -1408,7 +1408,7 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
 
     internal void embed_header() {
         if (this.header.parent == null) {
-            this.header_area.add(this.header);
+            this.header_container.add(this.header);
             this.header.hexpand = true;
         }
     }
diff --git a/ui/composer-widget.ui b/ui/composer-widget.ui
index dc7d4dbf..4a59bbd7 100644
--- a/ui/composer-widget.ui
+++ b/ui/composer-widget.ui
@@ -16,7 +16,7 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkBox" id="header_area">
+          <object class="GtkBox" id="header_container">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
@@ -40,7 +40,7 @@
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkBox" id="recipients">
+                  <object class="GtkBox" id="email_headers">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_start">6</property>