[geary/mjog/pinned_cert_dir] Application.Controller: Fix directory used for locally pinned certs

[Michael Gratton <mjog src gnome org>]

commit c4fae24262c6e6763649085dd021b1c5cf5dcd53
Author: Michael Gratton <mike vee net>
Date:   Mon Feb 1 22:07:16 2021 +1100

    Application.Controller: Fix directory used for locally pinned certs
    
    Fix defect introduced in commit e8061379.

 src/client/application/application-controller.vala | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/src/client/application/application-controller.vala 
b/src/client/application/application-controller.vala
index 203bbda3f..b9e4e639b 100644
--- a/src/client/application/application-controller.vala
+++ b/src/client/application/application-controller.vala
@@ -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);