aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carrasco <me@miterion.de>2020-07-08 18:03:34 +0200
committerReto Brunner <reto@labrat.space>2020-07-09 08:37:01 +0200
commit749dbb93a4af2dc3afdda4c9fe8a300b43a69d0f (patch)
tree37f1da67de1f6930558d03cdf1f4cdbc5585b84f
parent32df768d0359dbdc1a49f01cf68b9ca7633bb44c (diff)
downloadaerc-749dbb93a4af2dc3afdda4c9fe8a300b43a69d0f.tar.gz
Use PushStatus instead of SetStatus where it makes sense
-rw-r--r--commands/account/clear.go3
-rw-r--r--commands/compose/send.go4
-rw-r--r--widgets/account.go3
3 files changed, 4 insertions, 6 deletions
diff --git a/commands/account/clear.go b/commands/account/clear.go
index 392fdd0b..263b5dea 100644
--- a/commands/account/clear.go
+++ b/commands/account/clear.go
@@ -2,6 +2,7 @@ package account
import (
"errors"
+ "time"
"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")
}
store.ApplyClear()
- aerc.SetStatus("Clear complete.")
+ aerc.PushStatus("Clear complete.", 10*time.Second)
return nil
}
diff --git a/commands/compose/send.go b/commands/compose/send.go
index 59ae5d0b..40ac4ca0 100644
--- a/commands/compose/send.go
+++ b/commands/compose/send.go
@@ -12,7 +12,6 @@ import (
"github.com/emersion/go-sasl"
"github.com/emersion/go-smtp"
- "github.com/gdamore/tcell"
"github.com/google/shlex"
"github.com/miolini/datacounter"
"github.com/pkg/errors"
@@ -225,8 +224,7 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error {
aerc.PushStatus("Sending...", 10*time.Second)
nbytes, err := sendAsync()
if err != nil {
- aerc.SetStatus(" "+err.Error()).
- Color(tcell.ColorDefault, tcell.ColorRed)
+ aerc.PushError(" " + err.Error())
return
}
if config.CopyTo != "" {
diff --git a/widgets/account.go b/widgets/account.go
index 313a364a..211f09d7 100644
--- a/widgets/account.go
+++ b/widgets/account.go
@@ -273,8 +273,7 @@ func (acct *AccountView) onMessage(msg types.WorkerMessage) {
acct.labels = msg.Labels
case *types.Error:
acct.logger.Printf("%v", msg.Error)
- acct.host.SetStatus(fmt.Sprintf("%v", msg.Error)).
- Color(tcell.ColorDefault, tcell.ColorRed)
+ acct.aerc.PushError(fmt.Sprintf("%v", msg.Error))
}
}