[folks] eds: Fix a variable's visibility in the e-d-s Backend



commit 047baeab0b6ecf084c8e4bbf89bd3049cf6cb66c
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Jul 13 19:29:46 2011 +0100

    eds: Fix a variable's visibility in the e-d-s Backend
    
    This also takes the opportunity to s/addressbook/address book/ an environment
    variable, since the official GNOME terminology is âaddress bookâ rather than
    âaddressbookâ.

 backends/eds/eds-backend.vala |    6 +++---
 tests/lib/eds/backend.vala    |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/backends/eds/eds-backend.vala b/backends/eds/eds-backend.vala
index f59bb2e..44fd4ad 100644
--- a/backends/eds/eds-backend.vala
+++ b/backends/eds/eds-backend.vala
@@ -34,8 +34,8 @@ extern const string BACKEND_NAME;
  */
 public class Folks.Backends.Eds.Backend : Folks.Backend
 {
-  public static const string use_addressbooks =
-      "FOLKS_BACKEND_EDS_USE_ADDRESSBOOKS";
+  private static const string _use_address_books =
+      "FOLKS_BACKEND_EDS_USE_ADDRESS_BOOKS";
   private bool _is_prepared = false;
   private HashMap<string, PersonaStore> _persona_stores;
   private Map<string, PersonaStore> _persona_stores_ro;
@@ -237,7 +237,7 @@ public class Folks.Backends.Eds.Backend : Folks.Backend
   private string[] _get_addressbooks_from_env ()
     {
       string[] addressbooks = {};
-      string ab_list = Environment.get_variable (this.use_addressbooks);
+      string ab_list = Environment.get_variable (this._use_address_books);
 
       if (ab_list != null && ab_list != "")
         {
diff --git a/tests/lib/eds/backend.vala b/tests/lib/eds/backend.vala
index bf32db0..466e62e 100644
--- a/tests/lib/eds/backend.vala
+++ b/tests/lib/eds/backend.vala
@@ -98,7 +98,7 @@ public class EdsTest.Backend
           this._addressbook.open_sync (false, null);
           this._addressbook_name =
             this._addressbook.get_source ().peek_name ();
-          Environment.set_variable ("FOLKS_BACKEND_EDS_USE_ADDRESSBOOKS",
+          Environment.set_variable ("FOLKS_BACKEND_EDS_USE_ADDRESS_BOOKS",
                                     this._addressbook_name, true);
         }
       catch (GLib.Error e)
@@ -251,7 +251,7 @@ public class EdsTest.Backend
 
   public void tear_down ()
     {
-      Environment.set_variable ("FOLKS_BACKEND_EDS_USE_ADDRESSBOOKS",
+      Environment.set_variable ("FOLKS_BACKEND_EDS_USE_ADDRESS_BOOKS",
           "", true);
 
       try
@@ -288,4 +288,4 @@ public class EdsTest.Backend
 
       return ret;
     }
-}
\ No newline at end of file
+}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]