PIM Manager: implemented SetActiveAddressBooks()

The set of active EDS databases is set after backends are loaded and
before the aggregator is asked to start. This ensures that we never
load data from inactive databases.

The patch depends on a functional implementation of the
folks_backend_set_persona_stores() method. The
folks_individual_aggregator_new_with_backend_store() is used although
it is not necessary at the moment, because there is only a single
instance of the FolksBackendStore class.

Tests cover running with no active address book and merging data from
two address books. The testMerge test case has several properties.
The one which causes folks to link it is X-JABBER and EMAIL (with
the patch for https://bugzilla.gnome.org/show_bug.cgi?id=685401).

1 files changed, 6 insertions, 2 deletions

diff --git a/src/dbus/server/pim/manager.h b/src/dbus/server/pim/manager.h
index 886bb783..956d6529 100644
--- a/src/dbus/server/pim/manager.h
+++ b/src/dbus/server/pim/manager.h
@@ -41,10 +41,10 @@ class Manager : public GDBusCXX::DBusObjectHelper
     boost::shared_ptr<IndividualAggregator> m_folks;
     std::string m_sortOrder;
     /**
-     * Contains the UIDs of all peers contributing to the current
+     * Contains the EDS UUIDs of all address books contributing to the current
      * unified address book.
      */
-    std::set<std::string> m_enabledPeers;
+    std::set<std::string> m_enabledEBooks;
 
     typedef std::list< std::pair< boost::shared_ptr<GDBusCXX::Result>, boost::shared_ptr<Session> > > Pending_t;
     /** holds the references to pending session requests, see runInSession() */
@@ -53,6 +53,7 @@ class Manager : public GDBusCXX::DBusObjectHelper
     Manager(const boost::shared_ptr<Server> &server);
     void init();
     void initFolks();
+    void initDatabases();
     void initSorting();
 
     /** Manager.Start() */
@@ -69,6 +70,9 @@ class Manager : public GDBusCXX::DBusObjectHelper
                                   const StringMap &filter,
                                   const GDBusCXX::DBusObject_t &agentPath);
 
+    /** Manager.SetActiveAddressBooks() */
+    void setActiveAddressBooks(const std::vector<std::string> &dbIDs);
+
     /** Manager.SetPeer() */
     void setPeer(const boost::shared_ptr<GDBusCXX::Result0> &result,
                  const std::string &uid, const StringMap &properties);