diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-06-30 21:52:27 +0800 |
|---|---|---|
| committer | Travis Reitter <treitter@gmail.com> | 2010-07-27 18:51:12 +0800 |
| commit | da3c11790a80db7fce92778352481bafd95bf939 (patch) | |
| tree | 7dc1584b9b8c1ff69cf8892b6d78891602a991e4 | |
| parent | fa64735c16e43857bdcee54b55b4911766731f3b (diff) | |
| download | gsoc2013-empathy-da3c11790a80db7fce92778352481bafd95bf939.tar gsoc2013-empathy-da3c11790a80db7fce92778352481bafd95bf939.tar.gz gsoc2013-empathy-da3c11790a80db7fce92778352481bafd95bf939.tar.bz2 gsoc2013-empathy-da3c11790a80db7fce92778352481bafd95bf939.tar.lz gsoc2013-empathy-da3c11790a80db7fce92778352481bafd95bf939.tar.xz gsoc2013-empathy-da3c11790a80db7fce92778352481bafd95bf939.tar.zst gsoc2013-empathy-da3c11790a80db7fce92778352481bafd95bf939.zip | |
Use the new IndividualAggregator.prepare() method
This avoids races when connecting to signals from the IndividualAggregator.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libempathy/empathy-individual-manager.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 37de4493c..7d735187d 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 cb3a3975e..e10b27c7d 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 * |