core: Change default EDS PersonaStore ID to ‘system-address-book’

The new version of EDS uses that instead of ‘system’. This shouldn’t pose
upgrade problems (e.g. if a user has ‘system’ stored in GSettings), since in
that case the ‘system’ persona store wouldn’t be found, and the fallback
would be to use the persona store marked as the system-set default — which
is the ‘system-address-book’ persona store, as required.

diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index cf5415e..9cec0fb 100644 (file)
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -318,7 +318,7 @@ public class Folks.IndividualAggregator : Object
           if (BuildConf.HAVE_EDS)
             {
               this._configured_primary_store_type_id = "eds";
-              this._configured_primary_store_id = "system";
+              this._configured_primary_store_id = "system-address-book";
             }
           else
             {

diff --git a/folks/org.freedesktop.folks.gschema.xml.in b/folks/org.freedesktop.folks.gschema.xml.in
index 372a173..ce26926 100644 (file)
--- a/folks/org.freedesktop.folks.gschema.xml.in
+++ b/folks/org.freedesktop.folks.gschema.xml.in
@@ -6,7 +6,7 @@
       <summary>Primary store ID</summary>
       <description>The ID of the persona store which folks should use as primary (i.e. to store linking data in).
           The type ID of the store may optionally be prepended, separated by a colon.
-          For example: “eds:system” or “key-file”.</description>
+          For example: “eds:system-address-book” or “key-file”.</description>
     </key>
   </schema>
 </schemalist>

diff --git a/tests/eds/change-primary-store.vala b/tests/eds/change-primary-store.vala
index 54f1d7d..9d821aa 100644 (file)
--- a/tests/eds/change-primary-store.vala
+++ b/tests/eds/change-primary-store.vala
@@ -36,7 +36,7 @@ public class ChangePrimaryStoreTests : Folks.TestCase
       base ("ChangePrimaryStoreTests");
 
       this._eds_backend = new EdsTest.Backend ();
-      this._eds_backend.address_book_uri = "system";
+      this._eds_backend.address_book_uri = "system-address-book";
       this._eds_backend_other = new EdsTest.Backend ();
       this._eds_backend_other.address_book_uri = "other";