[geary/wip/248-no-compiser-from-without-aliases] Show From field in paned composer when other accounts exist
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/248-no-compiser-from-without-aliases] Show From field in paned composer when other accounts exist
- Date: Thu, 21 Feb 2019 00:42:52 +0000 (UTC)
commit 064e926ba44b09328076e5101cb79b175f08bfe1
Author: Michael Gratton <mike vee net>
Date: Thu Feb 21 11:39:20 2019 +1100
Show From field in paned composer when other accounts exist
If an account was selected that did not have any aliases and a new
composer was opened, the From field would be missing, even if there was
another account.
Fixes #248
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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]