update for Claws Mail 3.16

1 files changed, 10 insertions, 2 deletions

diff --git a/lib/Config/ClawsMail.pm b/lib/Config/ClawsMail.pm
index decb99f..9c11636 100644
--- a/lib/Config/ClawsMail.pm
+++ b/lib/Config/ClawsMail.pm
@@ -3,6 +3,7 @@ use Moo;
 # VERSION
 use Config::INI::Reader;
 use Config::ClawsMail::Account;
+use Config::ClawsMail::PasswordStoreParser;
 use Types::Standard qw(HashRef InstanceOf);
 use Path::Tiny;
 use namespace::clean;
@@ -26,9 +27,16 @@ sub BUILDARGS {
     my $config_hash = Config::INI::Reader->read_file(
         $config_file,
     );
+    my $password_file = delete $args->{password_file}
+        || path($ENV{HOME},'.claws-mail','passwordstorerc');
+    my $password_hash = Config::ClawsMail::PasswordStoreParser->read_file(
+        $password_file,
+    );
 
-    for my $account_conf (values %{$config_hash}) {
-        my $account = Config::ClawsMail::Account->new_from_config($account_conf);
+    for my $account_id (keys %{$config_hash}) {
+        my $account_conf = $config_hash->{$account_id};
+        my $password_conf = $password_hash->{$account_id};
+        my $account = Config::ClawsMail::Account->new_from_config($account_conf,$password_conf);
         $args->{accounts}{$account->account_name} = $account;
     }