aboutsummaryrefslogtreecommitdiffstats
path: root/aerc.go
diff options
context:
space:
mode:
Diffstat (limited to 'aerc.go')
-rw-r--r--aerc.go11
1 files changed, 6 insertions, 5 deletions
diff --git a/aerc.go b/aerc.go
index f9a19a31..57259be1 100644
--- a/aerc.go
+++ b/aerc.go
@@ -22,6 +22,7 @@ import (
"git.sr.ht/~rjarry/aerc/commands/terminal"
"git.sr.ht/~rjarry/aerc/config"
"git.sr.ht/~rjarry/aerc/lib"
+ "git.sr.ht/~rjarry/aerc/lib/crypto"
"git.sr.ht/~rjarry/aerc/lib/templates"
libui "git.sr.ht/~rjarry/aerc/lib/ui"
"git.sr.ht/~rjarry/aerc/logging"
@@ -168,7 +169,11 @@ func main() {
deferLoop := make(chan struct{})
- aerc = widgets.NewAerc(conf, logger, func(cmd []string) error {
+ c := crypto.New(conf.General.PgpProvider)
+ c.Init(logger)
+ defer c.Close()
+
+ aerc = widgets.NewAerc(conf, logger, c, func(cmd []string) error {
return execCommand(aerc, ui, cmd)
}, func(cmd string) []string {
return getCompletions(aerc, cmd)
@@ -188,10 +193,6 @@ func main() {
ui.EnableMouse()
}
- logger.Println("Initializing PGP keyring")
- lib.InitKeyring()
- defer lib.UnlockKeyring()
-
logger.Println("Starting Unix server")
as, err := lib.StartServer(logger)
if err != nil {