From: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Wed, 30 Jun 2010 13:52:27 +0000 (+0100)
Subject: Use the new IndividualAggregator.prepare() method
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=da3c11790a80db7fce92778352481bafd95bf939

Use the new IndividualAggregator.prepare() method

This avoids races when connecting to signals from the IndividualAggregator.
---

diff --git a/configure.ac b/configure.ac
index 37de4493..7d735187 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.1.9
+FOLKS_REQUIRED=0.1.11
 GCONF_REQUIRED=1.2.0
 GLIB_REQUIRED=2.25.9
 GTK_REQUIRED=2.21.2
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index cb3a3975..e10b27c7 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -228,6 +228,7 @@ empathy_individual_manager_init (EmpathyIndividualManager *self)
   priv->aggregator = folks_individual_aggregator_new ();
   g_signal_connect (priv->aggregator, "individuals-changed",
       G_CALLBACK (aggregator_individuals_changed_cb), self);
+  folks_individual_aggregator_prepare (priv->aggregator, NULL, NULL);
 }
 
 EmpathyIndividualManager *