[geary/gnome-3-32] Merge branch 'wip/flatpak-folks-eds-access' into 'master'

[Michael Gratton <mjog src gnome org>]

commit af58fbdf0ac190cd6ba4816623cf829a85ddf5a4
Author: Michael Gratton <mike vee net>
Date:   Sun Mar 17 06:20:32 2019 +0000

    Merge branch 'wip/flatpak-folks-eds-access' into 'master'
    
    Fix no access to EDS contacts and avatars under Flatpak
    
    See merge request GNOME/geary!174
    
    (cherry picked from commit c053086182faad14b0cefcc4392a6192c6fad26e)
    
    2be293d9 Fix no access to EDS contacts and avatars under Flatpak

 org.gnome.Geary.json | 5 +++++
 1 file changed, 5 insertions(+)
---
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index 44fa46b9..c6a625e7 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -48,6 +48,11 @@
         "--talk-name=org.gnome.ControlCenter",
         "--talk-name=org.gnome.OnlineAccounts",
 
+        /* Folks contact and avatar support (via EDS) */
+        "--talk-name=org.gnome.evolution.dataserver.AddressBook9",
+        "--talk-name=org.gnome.evolution.dataserver.Sources5",
+        "--filesystem=xdg-cache/evolution/addressbook:ro",
+
         /* Needed for dconf to work */
         "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
         "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf",