[folks] eds: Only use enabled ESources from EDS

[Philip Withnall <pwithnall src gnome org>]

commit 1236e1c521fdf38d70dfce95c7b4055f27794522
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Feb 16 16:37:29 2014 +0000

    eds: Only use enabled ESources from EDS
    
    Don’t ignore the enabled/disabled state of the ESource. When EDS sources
    (such as the Google Contacts address book) are toggled in GOA, they’re
    disabled, not removed. Folks needs to respect that.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=722579

 NEWS                                     |    2 ++
 backends/eds/eds-backend.vala            |    2 +-
 backends/eds/lib/edsf-persona-store.vala |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 6380bd6..d1cf948 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,8 @@ Bugs fixed:
  • Bug 722892 — Linking personas on Dummy backend does not work
  • Bug 726980 — dependency on e-d-s 3.9 is often unnecessary
  • Bug 727405 — setting FOLKS_DISABLE_LINKING to on does not work
+ • Bug 722579 — Contacts are displayed for Google accounts where contact
+   management is disabled in GOA
 
 API changes:
  • Add Individual.display_name
diff --git a/backends/eds/eds-backend.vala b/backends/eds/eds-backend.vala
index 7bdb1a5..1f9a304 100644
--- a/backends/eds/eds-backend.vala
+++ b/backends/eds/eds-backend.vala
@@ -286,7 +286,7 @@ public class Folks.Backends.Eds.Backend : Folks.Backend
     {
       string[] use_addressbooks = this._get_addressbooks_from_env ();
       GLib.List<E.Source> books =
-          this._ab_sources.list_sources (SOURCE_EXTENSION_ADDRESS_BOOK);
+          this._ab_sources.list_enabled (SOURCE_EXTENSION_ADDRESS_BOOK);
 
       debug ("Address book source list changed.");
 
diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index 1fc3425..0a427d0 100644
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -2555,7 +2555,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
       if (needle != null && needle.has_extension (SOURCE_EXTENSION_ADDRESS_BOOK))
         {
           /* We've found ourself. */
-          return true;
+          return ((!) this._source_registry).check_enabled (needle);
         }
 
       return false;