From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Thu, 6 Oct 2011 22:00:46 +0000 (-0700)
Subject: Include required Telepathy Connection ContactInfo features.
X-Git-Tag: FOLKS_0_6_4~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=978c4d71d2136ff08e0aac4aae422e0c85a023db;p=platform%2Fupstream%2Ffolks.git

Include required Telepathy Connection ContactInfo features.

These are required to look up the connection's ContactInfoFlags.Can_Set
and SupportedFields. We need both to determine which ContactInfo fields
are writeable (for Tpf.Persona.writeable_properties).
---

diff --git a/backends/telepathy/lib/tpf-persona-store.vala b/backends/telepathy/lib/tpf-persona-store.vala
index 3f8c6ce..20b315f 100644
--- a/backends/telepathy/lib/tpf-persona-store.vala
+++ b/backends/telepathy/lib/tpf-persona-store.vala
@@ -62,6 +62,12 @@ public class Tpf.PersonaStore : Folks.PersonaStore
         ContactFeature.CONTACT_INFO
       };
 
+  private static GLib.Quark[] _connection_features =
+      {
+        TelepathyGLib.Connection.get_feature_quark_contact_info (),
+        0
+      };
+
   private const string[] _always_writeable_properties =
     {
       "is-favourite"
@@ -581,12 +587,13 @@ public class Tpf.PersonaStore : Folks.PersonaStore
                   this._logger = null;
                 }
 
-              /* Ensure the account's prepared first. */
-              yield this.account.prepare_async (null);
-
               this.account.notify["connection"].connect (
                   this._notify_connection_cb);
 
+              /* Ensure the connection is prepared as necessary. */
+              yield this.account.connection.prepare_async (
+                  this._connection_features);
+
               /* immediately handle accounts which are not currently being
                * disconnected */
               if (this.account.connection != null)