Use PushStatus instead of SetStatus where it makes sense

This commit is contained in:
Heiko Carrasco 2020-07-08 18:03:34 +02:00 committed by Reto Brunner
parent 32df768d03
commit 749dbb93a4
3 changed files with 4 additions and 6 deletions

View file

@ -2,6 +2,7 @@ package account
import ( import (
"errors" "errors"
"time"
"git.sr.ht/~sircmpwn/aerc/widgets" "git.sr.ht/~sircmpwn/aerc/widgets"
) )
@ -29,6 +30,6 @@ func (Clear) Execute(aerc *widgets.Aerc, args []string) error {
return errors.New("Cannot perform action. Messages still loading") return errors.New("Cannot perform action. Messages still loading")
} }
store.ApplyClear() store.ApplyClear()
aerc.SetStatus("Clear complete.") aerc.PushStatus("Clear complete.", 10*time.Second)
return nil return nil
} }

View file

@ -12,7 +12,6 @@ import (
"github.com/emersion/go-sasl" "github.com/emersion/go-sasl"
"github.com/emersion/go-smtp" "github.com/emersion/go-smtp"
"github.com/gdamore/tcell"
"github.com/google/shlex" "github.com/google/shlex"
"github.com/miolini/datacounter" "github.com/miolini/datacounter"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -225,8 +224,7 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error {
aerc.PushStatus("Sending...", 10*time.Second) aerc.PushStatus("Sending...", 10*time.Second)
nbytes, err := sendAsync() nbytes, err := sendAsync()
if err != nil { if err != nil {
aerc.SetStatus(" "+err.Error()). aerc.PushError(" " + err.Error())
Color(tcell.ColorDefault, tcell.ColorRed)
return return
} }
if config.CopyTo != "" { if config.CopyTo != "" {

View file

@ -273,8 +273,7 @@ func (acct *AccountView) onMessage(msg types.WorkerMessage) {
acct.labels = msg.Labels acct.labels = msg.Labels
case *types.Error: case *types.Error:
acct.logger.Printf("%v", msg.Error) acct.logger.Printf("%v", msg.Error)
acct.host.SetStatus(fmt.Sprintf("%v", msg.Error)). acct.aerc.PushError(fmt.Sprintf("%v", msg.Error))
Color(tcell.ColorDefault, tcell.ColorRed)
} }
} }