[folks] core: Change default EDS PersonaStore ID to âsystem-address-bookâ

[Philip Withnall <pwithnall src gnome org>]

commit 392ece02e7bb0e564f9b8fdd6472ab95d6b78361
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Jun 18 12:11:39 2012 +0100

    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.

 folks/individual-aggregator.vala           |    2 +-
 folks/org.freedesktop.folks.gschema.xml.in |    2 +-
 tests/eds/change-primary-store.vala        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index cf5415e..9cec0fb 100644
--- 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
--- 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
--- 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";