aerc

Working clone of aerc-mail.org
git clone git://git.danielmoch.com/aerc.git
Log | Files | Refs | README | LICENSE

commit 77c76ba46296f57f88c591a420e929a059a55d3e
parent b181e0449d552a03db49da8e3edace9b3d7cfaa6
Author: Drew DeVault <sir@cmpwn.com>
Date:   Fri, 15 Mar 2019 21:33:08 -0400

Implement default in accounts.conf

Diffstat:
Mconfig/config.go | 11+++++++----
Mwidgets/account.go | 2+-
2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/config/config.go b/config/config.go @@ -22,6 +22,7 @@ type UIConfig struct { } type AccountConfig struct { + Default string Name string Source string Folders []string @@ -63,14 +64,16 @@ func loadAccountConfig(path string) ([]AccountConfig, error) { continue } sec := file.Section(_sec) - account := AccountConfig{Name: _sec} + account := AccountConfig{ + Default: "INBOX", + Name: _sec, + Params: make(map[string]string), + } if err = sec.MapTo(&account); err != nil { return nil, err } for key, val := range sec.KeysHash() { - if key == "source" { - account.Source = val - } else if key == "folders" { + if key == "folders" { account.Folders = strings.Split(val, ",") } else if key != "name" { account.Params[key] = val diff --git a/widgets/account.go b/widgets/account.go @@ -173,7 +173,7 @@ func (acct *AccountView) connected(msg types.WorkerMessage) { acct.dirlist.UpdateList(func(dirs []string) { var dir string for _, _dir := range dirs { - if _dir == "INBOX" { + if _dir == acct.acct.Default { dir = _dir break }