nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mjog/pinned_cert_dir' into 'mainline'

Browse source 
Application.Controller: Fix directory used for locally pinned certs

See merge request GNOME/geary!652
This commit is contained in:
Michael Gratton 2021-02-02 21:47:48 +00:00
commit 77897cbe18
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/client/application/application-controller.vala
View file

@ -189,9 +189,15 @@ internal class Application.Controller :
// Hook up cert, accounts and credentials machinery
this.certificate_manager = yield new Application.CertificateManager(
config_dir.get_child("pinned-certs"),
data_dir.get_child("pinned-certs"),
cancellable
);
// Commit e8061379 mistakenly used config_dir for cert manager
// above, so remove it if found. This can be pulled out post
// v40.
Geary.Files.recursive_delete_async(
config_dir.get_child("pinned-certs")
);
SecretMediator? libsecret = yield new SecretMediator(cancellable);