[geary] Never enter inline compact mode when account has multiple emails

[Michael Gratton <mjog src gnome org>]

commit dec4416b52d1f0ceaa0df39d80589e96e32490d6
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Wed Dec 6 07:46:18 2017 -0600

    Never enter inline compact mode when account has multiple emails
    
    If the current account has multiple emails, we must never enter inline
    compact mode, otherwise the user has no chance to pick the right email.
    Geary currently tries to guess which email to send the mail from, but
    it can't always be right.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=791230

 src/client/composer/composer-widget.vala |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index a62bf0c..62fa2a0 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -390,7 +390,7 @@ public class ComposerWidget : Gtk.EventBox {
         this.compose_type = compose_type;
         if (this.compose_type == ComposeType.NEW_MESSAGE)
             this.state = ComposerState.NEW;
-        else if (this.compose_type == ComposeType.FORWARD)
+        else if (this.compose_type == ComposeType.FORWARD || this.account.information.alternate_mailboxes != 
null)
             this.state = ComposerState.INLINE;
         else
             this.state = ComposerState.INLINE_COMPACT;
@@ -713,7 +713,8 @@ public class ComposerWidget : Gtk.EventBox {
         if (in_reply_to.size > 1) {
             this.state = ComposerState.PANED;
         } else if (this.compose_type == ComposeType.FORWARD || this.to_entry.modified
-                   || this.cc_entry.modified || this.bcc_entry.modified) {
+                   || this.cc_entry.modified || this.bcc_entry.modified
+                   || this.account.information.alternate_mailboxes != null) {
             this.state = ComposerState.INLINE;
         } else {
             this.state = ComposerState.INLINE_COMPACT;