[geary/mjog/data-location-migration: 26/29] org.gnome.Geary.yaml: Enable copying release config for nightlies

[Michael Gratton <mjog src gnome org>]

commit 899834189cb8a077fe2b67b0088761cfae5d7452
Author: Michael Gratton <mike vee net>
Date:   Tue Oct 13 23:45:44 2020 +1100

    org.gnome.Geary.yaml: Enable copying release config for nightlies

 org.gnome.Geary.json | 2 ++
 org.gnome.Geary.yaml | 4 ++++
 2 files changed, 6 insertions(+)
---
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index 99e416122..7f55fb1f7 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -25,6 +25,8 @@
         "--talk-name=org.gnome.evolution.dataserver.Sources5",
         "--filesystem=xdg-cache/evolution/addressbook:ro",
         "--metadata=X-DConf=migrate-path=/org/gnome/Geary/",
+        "--filesystem=~/.config/geary:ro",
+        "--filesystem=~/.var/app/org.gnome.Geary/config/geary:ro",
         "--filesystem=/tmp"
     ],
     "cleanup": [
diff --git a/org.gnome.Geary.yaml b/org.gnome.Geary.yaml
index 0dd89a18d..f5d200f63 100644
--- a/org.gnome.Geary.yaml
+++ b/org.gnome.Geary.yaml
@@ -57,6 +57,10 @@ finish-args:
   # Migrate GSettings into the sandbox
   - "--metadata=X-DConf=migrate-path=/org/gnome/Geary/"
 
+  # Migrate Geary settings from other release versions
+  - "--filesystem=~/.config/geary:ro"
+  - "--filesystem=~/.var/app/org.gnome.Geary/config/geary:ro"
+
   # Let view source keep on working as-sis for now. Bug 779311. */
   - "--filesystem=/tmp"