[geary/geary-0.13] Merge branch 'wip/248-no-compiser-from-without-aliases' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 87da30909e56f87d5dbf150ba35b874f14060510
Author: Michael Gratton <mike vee net>
Date:   Thu Feb 21 01:12:24 2019 +0000

    Merge branch 'wip/248-no-compiser-from-without-aliases' into 'master'
    
    Show From field in paned composer when other accounts exist
    
    Closes #248
    
    See merge request GNOME/geary!126
    
    (cherry picked from commit 288178b5813c6c97d849df9fd1ed607336975140)
    
    064e926b Show From field in paned composer when other accounts exist

 src/client/composer/composer-widget.vala | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index 16437a3e..8d06bc65 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -2098,18 +2098,20 @@ public class ComposerWidget : Gtk.EventBox, Geary.BaseInterface {
         try {
             accounts = Geary.Engine.instance.get_accounts();
         } catch (Error e) {
-            debug("Could not fetch account info: %s", e.message);
-
+            warning("Could not fetch account info: %s", e.message);
             return false;
         }
 
-        // Don't show in inline, compact, or paned modes, unless the current
-        // account has multiple emails.
-        if ((this.state == ComposerState.INLINE || this.state == ComposerState.INLINE_COMPACT ||
-             this.state == ComposerState.PANED) && !this.account.information.has_sender_aliases)
+        // Don't show in inline unless the current account has
+        // multiple emails, since these will be replies to a
+        // conversation
+        if ((this.state == ComposerState.INLINE ||
+             this.state == ComposerState.INLINE_COMPACT) &&
+            !this.account.information.has_sender_aliases)
             return false;
 
-        // If there's only one account, show nothing. (From fields are hidden above.)
+        // If there's only one account and it not have any aliases,
+        // show nothing.
         if (accounts.size < 1 || (accounts.size == 1 && !Geary.traverse<Geary.AccountInformation>(
             accounts.values).first().has_sender_aliases))
             return false;