diff options
| author | Ben Fiedler <git@services.bfiedler.ch> | 2020-04-23 03:56:28 +0200 |
|---|---|---|
| committer | Reto Brunner <reto@labrat.space> | 2020-04-23 21:02:45 +0200 |
| commit | 7c89143c709e58f22a4939886ccb15bd639eec17 (patch) | |
| tree | 4714984f29b0f42014436401665d9430ec288d31 /widgets | |
| parent | 280d8e7e1cce40f11c6d5f368f9060486556f96b (diff) | |
| download | aerc-7c89143c709e58f22a4939886ccb15bd639eec17.tar.gz | |
Use aerc.PushError where appropriate
Forgot an unused import, to save you the hassle here is v2.
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/account-wizard.go | 10 | ||||
| -rw-r--r-- | widgets/aerc.go | 9 |
2 files changed, 6 insertions, 13 deletions
diff --git a/widgets/account-wizard.go b/widgets/account-wizard.go index d7b46b9e..e9bd8438 100644 --- a/widgets/account-wizard.go +++ b/widgets/account-wizard.go @@ -10,7 +10,6 @@ import ( "path" "strconv" "strings" - "time" "github.com/gdamore/tcell" "github.com/go-ini/ini" @@ -415,8 +414,7 @@ func (wizard *AccountWizard) ConfigureTemporaryAccount(temporary bool) { func (wizard *AccountWizard) errorFor(d ui.Interactive, err error) { if d == nil { - wizard.aerc.PushStatus(" "+err.Error(), 10*time.Second). - Color(tcell.ColorDefault, tcell.ColorRed) + wizard.aerc.PushError(" "+err.Error()) wizard.Invalidate() return } @@ -431,8 +429,7 @@ func (wizard *AccountWizard) errorFor(d ui.Interactive, err error) { wizard.step = step wizard.focus = focus wizard.Focus(true) - wizard.aerc.PushStatus(" "+err.Error(), 10*time.Second). - Color(tcell.ColorDefault, tcell.ColorRed) + wizard.aerc.PushError(" "+err.Error()) wizard.Invalidate() return } @@ -543,8 +540,7 @@ func (wizard *AccountWizard) finish(tutorial bool) { term.OnClose = func(err error) { wizard.aerc.RemoveTab(term) if err != nil { - wizard.aerc.PushStatus(" "+err.Error(), 10*time.Second). - Color(tcell.ColorDefault, tcell.ColorRed) + wizard.aerc.PushError(" "+err.Error()) } } } diff --git a/widgets/aerc.go b/widgets/aerc.go index 4c8d09df..1d456964 100644 --- a/widgets/aerc.go +++ b/widgets/aerc.go @@ -408,13 +408,11 @@ func (aerc *Aerc) BeginExCommand(cmd string) { exline := NewExLine(aerc.conf, cmd, func(cmd string) { parts, err := shlex.Split(cmd) if err != nil { - aerc.PushStatus(" "+err.Error(), 10*time.Second). - Color(tcell.ColorDefault, tcell.ColorRed) + aerc.PushError(" "+err.Error()) } err = aerc.cmd(parts) if err != nil { - aerc.PushStatus(" "+err.Error(), 10*time.Second). - Color(tcell.ColorDefault, tcell.ColorRed) + aerc.PushError(" "+err.Error()) } // only add to history if this is an unsimulated command, // ie one not executed from a keybinding @@ -438,8 +436,7 @@ func (aerc *Aerc) RegisterPrompt(prompt string, cmd []string) { } err := aerc.cmd(cmd) if err != nil { - aerc.PushStatus(" "+err.Error(), 10*time.Second). - Color(tcell.ColorDefault, tcell.ColorRed) + aerc.PushError(" "+err.Error()) } }, func(cmd string) []string { return nil // TODO: completions |