diff options
Diffstat (limited to 'commands/msg')
-rw-r--r-- | commands/msg/forward.go | 2 | ||||
-rw-r--r-- | commands/msg/invite.go | 2 | ||||
-rw-r--r-- | commands/msg/recall.go | 2 | ||||
-rw-r--r-- | commands/msg/reply.go | 3 | ||||
-rw-r--r-- | commands/msg/unsubscribe.go | 3 |
5 files changed, 6 insertions, 6 deletions
diff --git a/commands/msg/forward.go b/commands/msg/forward.go index 9a4f3d41..90c32ec2 100644 --- a/commands/msg/forward.go +++ b/commands/msg/forward.go @@ -101,7 +101,7 @@ func (forward) Execute(aerc *widgets.Aerc, args []string) error { addTab := func() (*widgets.Composer, error) { composer, err := widgets.NewComposer(aerc, acct, - acct.AccountConfig(), acct.Worker(), template, h, original) + acct.AccountConfig(), acct.Worker(), template, h, &original) if err != nil { aerc.PushError("Error: " + err.Error()) return nil, err diff --git a/commands/msg/invite.go b/commands/msg/invite.go index ef28b91c..1528abea 100644 --- a/commands/msg/invite.go +++ b/commands/msg/invite.go @@ -139,7 +139,7 @@ func (invite) Execute(aerc *widgets.Aerc, args []string) error { addTab := func(cr *calendar.Reply) error { composer, err := widgets.NewComposer(aerc, acct, - acct.AccountConfig(), acct.Worker(), "", h, original) + acct.AccountConfig(), acct.Worker(), "", h, &original) if err != nil { aerc.PushError("Error: " + err.Error()) return err diff --git a/commands/msg/recall.go b/commands/msg/recall.go index f106e8bd..2ef468e0 100644 --- a/commands/msg/recall.go +++ b/commands/msg/recall.go @@ -74,7 +74,7 @@ func (Recall) Execute(aerc *widgets.Aerc, args []string) error { composer, err := widgets.NewComposer(aerc, acct, acct.AccountConfig(), acct.Worker(), "", msgInfo.RFC822Headers, - models.OriginalMail{}) + nil) if err != nil { return errors.Wrap(err, "Cannot open a new composer") } diff --git a/commands/msg/reply.go b/commands/msg/reply.go index 795158ca..f8cde644 100644 --- a/commands/msg/reply.go +++ b/commands/msg/reply.go @@ -175,7 +175,8 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error { mv, _ := aerc.SelectedTabContent().(*widgets.MessageViewer) addTab := func() error { composer, err := widgets.NewComposer(aerc, acct, - acct.AccountConfig(), acct.Worker(), template, h, original) + acct.AccountConfig(), acct.Worker(), template, h, + &original) if err != nil { aerc.PushError("Error: " + err.Error()) return err diff --git a/commands/msg/unsubscribe.go b/commands/msg/unsubscribe.go index a334e827..66797660 100644 --- a/commands/msg/unsubscribe.go +++ b/commands/msg/unsubscribe.go @@ -11,7 +11,6 @@ import ( "git.sr.ht/~rjarry/aerc/lib" "git.sr.ht/~rjarry/aerc/lib/ui" "git.sr.ht/~rjarry/aerc/log" - "git.sr.ht/~rjarry/aerc/models" "git.sr.ht/~rjarry/aerc/widgets" "github.com/emersion/go-message/mail" ) @@ -155,7 +154,7 @@ func unsubscribeMailto(aerc *widgets.Aerc, u *url.URL) error { acct.Worker(), "", h, - models.OriginalMail{}, + nil, ) if err != nil { return err |