diff options
Diffstat (limited to 'commands/account')
| -rw-r--r-- | commands/account/compose.go | 5 | ||||
| -rw-r--r-- | commands/account/recover.go | 2 | ||||
| -rw-r--r-- | commands/account/view.go | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/commands/account/compose.go b/commands/account/compose.go index 3d3d9afb..fb37b231 100644 --- a/commands/account/compose.go +++ b/commands/account/compose.go @@ -10,6 +10,7 @@ import ( "github.com/emersion/go-message/mail" + "git.sr.ht/~rjarry/aerc/config" "git.sr.ht/~rjarry/aerc/lib/ui" "git.sr.ht/~rjarry/aerc/log" "git.sr.ht/~rjarry/aerc/models" @@ -41,7 +42,7 @@ func (Compose) Execute(aerc *widgets.Aerc, args []string) error { return errors.New("No account selected") } if template == "" { - template = aerc.Config().Templates.NewMessage + template = config.Templates.NewMessage } msg, err := gomail.ReadMessage(strings.NewReader(body)) @@ -53,7 +54,7 @@ func (Compose) Execute(aerc *widgets.Aerc, args []string) error { headers := mail.HeaderFromMap(msg.Header) composer, err := widgets.NewComposer(aerc, acct, - aerc.Config(), acct.AccountConfig(), acct.Worker(), + acct.AccountConfig(), acct.Worker(), template, &headers, models.OriginalMail{}) if err != nil { return err diff --git a/commands/account/recover.go b/commands/account/recover.go index 9bb73316..8ce878ee 100644 --- a/commands/account/recover.go +++ b/commands/account/recover.go @@ -102,7 +102,7 @@ func (Recover) Execute(aerc *widgets.Aerc, args []string) error { } composer, err := widgets.NewComposer(aerc, acct, - aerc.Config(), acct.AccountConfig(), acct.Worker(), + acct.AccountConfig(), acct.Worker(), "", nil, models.OriginalMail{}) if err != nil { return err diff --git a/commands/account/view.go b/commands/account/view.go index f30ac61b..f48d3bc3 100644 --- a/commands/account/view.go +++ b/commands/account/view.go @@ -65,7 +65,7 @@ func (ViewMessage) Execute(aerc *widgets.Aerc, args []string) error { aerc.PushError(err.Error()) return } - viewer := widgets.NewMessageViewer(acct, aerc.Config(), view) + viewer := widgets.NewMessageViewer(acct, view) aerc.NewTab(viewer, msg.Envelope.Subject) }) return nil |