From 047baeab0b6ecf084c8e4bbf89bd3049cf6cb66c Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 13 Jul 2011 19:29:46 +0100 Subject: [PATCH] eds: Fix a variable's visibility in the e-d-s Backend MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 _persona_stores; private Map _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 +} -- 2.7.4