[folks] core: deprecate FOLKS_WRITEABLE_STORE for FOLKS_PRIMARY_STORE

[Raul Gutierrez Segales <raulgs src gnome org>]

commit 152ee3f06bd223c7ed9e9825543554031f490ddf
Author: Raul Gutierrez Segales <rgs collabora co uk>
Date:   Thu Sep 8 17:21:10 2011 +0100

    core: deprecate FOLKS_WRITEABLE_STORE for FOLKS_PRIMARY_STORE
    
    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=658323

 NEWS                             |    3 +++
 folks/individual-aggregator.vala |   17 ++++++++++++++---
 folks/persona-store.vala         |    2 +-
 tests/eds/Makefile.am            |    2 +-
 tests/folks/Makefile.am          |    2 +-
 tests/libsocialweb/Makefile.am   |    2 +-
 tests/telepathy/Makefile.am      |    2 +-
 tests/tracker/Makefile.am        |    2 +-
 8 files changed, 23 insertions(+), 9 deletions(-)
---
diff --git a/NEWS b/NEWS
index 8026e42..94f52a0 100644
--- a/NEWS
+++ b/NEWS
@@ -12,10 +12,13 @@ Bugs fixed:
   telepathy
 * Bug 658002 â defective typelib
 * Bug 657065 â Cache keeps around contacts from disabled accounts
+* Bug 658323 â Deprecate FOLKS_WRITEABLE_STORE in favour of FOLKS_PRIMARY_STORE
 
 API changes:
 * Individual.avatar is now settable using Individual.change_avatar() (not new
   API, but it no longer always returns an error)
+* We now use the FOLKS_PRIMARY_STORE env var instead of FOLKS_WRITEABLE_STORE
+  to configure the primary store
 
 Overview of changes from libfolks 0.6.2 to libfolks 0.6.2.1
 ===========================================================
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index 92a1ae5..35e7f9e 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -125,7 +125,7 @@ public class Folks.IndividualAggregator : Object
    * Which one to use is decided (in order or precedence)
    * by:
    *
-   * - the FOLKS_WRITEABLE_STORE env var (mostly for debugging)
+   * - the FOLKS_PRIMARY_STORE env var (mostly for debugging)
    * - the GConf key set in _FOLKS_CONFIG_KEY (system set store)
    * - going with the `key-file` or `eds` store as the fall-back option
    *
@@ -267,8 +267,19 @@ public class Folks.IndividualAggregator : Object
       this._debug = Debug.dup ();
       this._debug.print_status.connect (this._debug_print_status);
 
-      /* Check out the configured writeable store */
-      var store_config_ids = Environment.get_variable ("FOLKS_WRITEABLE_STORE");
+      /* Check out the configured primary store */
+      var store_config_ids = Environment.get_variable ("FOLKS_PRIMARY_STORE");
+      if (store_config_ids == null)
+        {
+          store_config_ids = Environment.get_variable ("FOLKS_WRITEABLE_STORE");
+          if (store_config_ids != null)
+            {
+              var deprecated_warn = "FOLKS_WRITEABLE_STORE is deprecated, ";
+              deprecated_warn += "use FOLKS_PRIMARY_STORE";
+              warning (deprecated_warn);
+            }
+        }
+
       if (store_config_ids != null)
         {
           this._set_writeable_store (store_config_ids);
diff --git a/folks/persona-store.vala b/folks/persona-store.vala
index 280494a..1b9e32a 100644
--- a/folks/persona-store.vala
+++ b/folks/persona-store.vala
@@ -399,7 +399,7 @@ public abstract class Folks.PersonaStore : Object
   public abstract string type_id
     {
       /* Note: the type_id must not contain colons because the primary writeable
-       * store is configured, either via GConf or the FOLKS_WRITEABLE_STORE
+       * store is configured, either via GConf or the FOLKS_PRIMARY_STORE
        * env variable, with a string of the form 'type_id:store_id'. */
       get;
     }
diff --git a/tests/eds/Makefile.am b/tests/eds/Makefile.am
index 3600292..68233d6 100644
--- a/tests/eds/Makefile.am
+++ b/tests/eds/Makefile.am
@@ -84,7 +84,7 @@ TESTS_ENVIRONMENT = \
 	FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \
         FOLKS_BACKEND_STORE_KEY_FILE_PATH=$(backend_store_key_file) \
 	AVATAR_FILE_PATH=$(avatar_file) \
-	FOLKS_WRITEABLE_STORE="eds:local://test" \
+	FOLKS_PRIMARY_STORE="eds:local://test" \
 	$(RUN_WITH_PRIVATE_BUS) \
 	--session \
 	--
diff --git a/tests/folks/Makefile.am b/tests/folks/Makefile.am
index 3cefdb0..b8b97f7 100644
--- a/tests/folks/Makefile.am
+++ b/tests/folks/Makefile.am
@@ -59,7 +59,7 @@ TESTS_ENVIRONMENT = \
 	GCONF_DEFAULT_SOURCE_PATH= abs_top_srcdir@/tests/data/gconf.path \
 	FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \
 	FOLKS_BACKEND_STORE_KEY_FILE_PATH=$(backend_store_key_file) \
-	FOLKS_WRITEABLE_STORE=key-file \
+	FOLKS_PRIMARY_STORE=key-file \
 	AVATAR_FILE_PATH=$(avatar_file) \
 	$(RUN_WITH_PRIVATE_BUS) \
 	--config-file=$(SESSION_CONF) \
diff --git a/tests/libsocialweb/Makefile.am b/tests/libsocialweb/Makefile.am
index f756314..34fd00a 100644
--- a/tests/libsocialweb/Makefile.am
+++ b/tests/libsocialweb/Makefile.am
@@ -55,7 +55,7 @@ TESTS_ENVIRONMENT = \
 	GCONF_DEFAULT_SOURCE_PATH= abs_top_srcdir@/tests/data/gconf.path \
 	FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \
 	FOLKS_BACKEND_STORE_KEY_FILE_PATH=$(backend_store_key_file) \
-	FOLKS_WRITEABLE_STORE=key-file \
+	FOLKS_PRIMARY_STORE=key-file \
 	$(RUN_WITH_PRIVATE_BUS) \
 	--config-file=$(SESSION_CONF) \
 	--
diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am
index 28dd5e1..70ce53c 100644
--- a/tests/telepathy/Makefile.am
+++ b/tests/telepathy/Makefile.am
@@ -57,7 +57,7 @@ TESTS_ENVIRONMENT = \
 	FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \
 	FOLKS_BACKEND_KEY_FILE_PATH=$(srcdir)/data/relationships-empty.ini \
 	FOLKS_BACKEND_STORE_KEY_FILE_PATH=$(backend_store_key_file) \
-	FOLKS_WRITEABLE_STORE=key-file \
+	FOLKS_PRIMARY_STORE=key-file \
 	$(RUN_WITH_PRIVATE_BUS) \
 	--config-file=$(SESSION_CONF) \
 	--
diff --git a/tests/tracker/Makefile.am b/tests/tracker/Makefile.am
index d39f517..6775840 100644
--- a/tests/tracker/Makefile.am
+++ b/tests/tracker/Makefile.am
@@ -112,7 +112,7 @@ TESTS_ENVIRONMENT = \
 	GCONF_DEFAULT_SOURCE_PATH= abs_top_srcdir@/tests/data/gconf.path \
 	FOLKS_BACKEND_PATH=$(BACKEND_UNINST_PATH) \
 	FOLKS_BACKEND_STORE_KEY_FILE_PATH=$(backend_store_key_file) \
-	FOLKS_WRITEABLE_STORE=tracker \
+	FOLKS_PRIMARY_STORE=tracker \
 	AVATAR_FILE_PATH=$(avatar_file) \
 	$(RUN_WITH_PRIVATE_BUS) \
 	--session \