[evolution-data-server/gnome-3-38] I#298 - Flatpak: Share NSS database with the system

[Milan Crha <mcrha src gnome org>]

commit c2778a55c026125f6c40b4dad80cccb847ecfbf0
Author: Milan Crha <mcrha redhat com>
Date:   Wed Feb 10 09:02:52 2021 +0100

    I#298 - Flatpak: Share NSS database with the system
    
    This basically reverts commit ef57f669d9295408edee2d3dfd69110d1853ff3c .
    
    Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/298

 src/camel/camel.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/src/camel/camel.c b/src/camel/camel.c
index 53dd50132..d2babff18 100644
--- a/src/camel/camel.c
+++ b/src/camel/camel.c
@@ -140,11 +140,8 @@ camel_init (const gchar *configdir,
 #else
                        gchar *user_nss_dir;
 
-                       /* Use a persistent location in Flatpak */
-                       if (g_file_test ("/.flatpak-info", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
-                               user_nss_dir = g_build_filename (nss_configdir, "nssdb", NULL);
-                       else
-                               user_nss_dir = g_build_filename (g_get_home_dir (), ".pki", "nssdb", NULL);
+                       /* Flatpak should allow access to the host machine's ~/.pki */
+                       user_nss_dir = g_build_filename (g_get_home_dir (), ".pki", "nssdb", NULL);
 
                        if (g_mkdir_with_parents (user_nss_dir, 0700))
                                g_warning (