1 files changed, 34 insertions, 15 deletions

diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 47a01cb8d..833a5692d 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -35,7 +35,6 @@
 #include <extensions/extensions.h>
 
 #include "empathy-individual-manager.h"
-#include "empathy-marshal.h"
 #include "empathy-utils.h"
 #include "empathy-contact-manager.h"
 
@@ -96,7 +95,7 @@ add_individual (EmpathyIndividualManager *self, FolksIndividual *individual)
   EmpathyIndividualManagerPriv *priv = GET_PRIV (self);
 
   g_hash_table_insert (priv->individuals,
-      (gpointer) folks_individual_get_id (individual),
+      g_strdup (folks_individual_get_id (individual)),
       g_object_ref (individual));
 
   g_signal_connect (individual, "group-changed",
@@ -162,16 +161,20 @@ individual_notify_personas_cb (FolksIndividual *individual,
 
 static void
 aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator,
-    GeeSet *added,
-    GeeSet *removed,
-    const char *message,
-    FolksPersona *actor,
-    guint reason,
+    GeeMultiMap *changes,
     EmpathyIndividualManager *self)
 {
   EmpathyIndividualManagerPriv *priv = GET_PRIV (self);
   GeeIterator *iter;
-  GList *added_filtered = NULL, *removed_list = NULL;
+  GeeSet *removed;
+  GeeCollection *added;
+  GList *added_set = NULL, *added_filtered = NULL, *removed_list = NULL;
+
+  /* We're not interested in the relationships between the added and removed
+   * individuals, so just extract collections of them. Note that the added
+   * collection may contain duplicates, while the removed set won't. */
+  removed = gee_multi_map_get_keys (changes);
+  added = gee_multi_map_get_values (changes);
 
   /* Handle the removals first, as one of the added Individuals might have the
    * same ID as one of the removed Individuals (due to linking). */
@@ -180,6 +183,9 @@ aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator,
     {
       FolksIndividual *ind = gee_iterator_get (iter);
 
+      if (ind == NULL)
+        continue;
+
       g_signal_handlers_disconnect_by_func (ind,
           individual_notify_personas_cb, self);
 
@@ -200,6 +206,11 @@ aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator,
     {
       FolksIndividual *ind = gee_iterator_get (iter);
 
+      /* Make sure we handle each added individual only once. */
+      if (ind == NULL || g_list_find (added_set, ind) != NULL)
+        continue;
+      added_set = g_list_prepend (added_set, ind);
+
       g_signal_connect (ind, "notify::personas",
           G_CALLBACK (individual_notify_personas_cb), self);
 
@@ -213,15 +224,20 @@ aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator,
     }
   g_clear_object (&iter);
 
+  g_list_free (added_set);
+
+  g_object_unref (added);
+  g_object_unref (removed);
+
   /* Bail if we have no individuals left */
   if (added_filtered == NULL && removed == NULL)
     return;
 
   added_filtered = g_list_reverse (added_filtered);
 
-  g_signal_emit (self, signals[MEMBERS_CHANGED], 0, message,
+  g_signal_emit (self, signals[MEMBERS_CHANGED], 0, NULL,
       added_filtered, removed_list,
-      tp_channel_group_change_reason_from_folks_groups_change_reason (reason),
+      TP_CHANNEL_GROUP_CHANGE_REASON_NONE,
       TRUE);
 
   g_list_free (added_filtered);
@@ -234,6 +250,9 @@ individual_manager_dispose (GObject *object)
   EmpathyIndividualManagerPriv *priv = GET_PRIV (object);
 
   g_hash_table_destroy (priv->individuals);
+
+  g_signal_handlers_disconnect_by_func (priv->aggregator,
+      aggregator_individuals_changed_cb, object);
   tp_clear_object (&priv->aggregator);
 
   G_OBJECT_CLASS (empathy_individual_manager_parent_class)->dispose (object);
@@ -294,7 +313,7 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass)
           G_SIGNAL_RUN_LAST,
           0,
           NULL, NULL,
-          _empathy_marshal_VOID__OBJECT_STRING_BOOLEAN,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 3, FOLKS_TYPE_INDIVIDUAL, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
   signals[FAVOURITES_CHANGED] =
@@ -303,7 +322,7 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass)
           G_SIGNAL_RUN_LAST,
           0,
           NULL, NULL,
-          _empathy_marshal_VOID__OBJECT_BOOLEAN,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 2, FOLKS_TYPE_INDIVIDUAL, G_TYPE_BOOLEAN);
 
   signals[MEMBERS_CHANGED] =
@@ -312,7 +331,7 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass)
           G_SIGNAL_RUN_LAST,
           0,
           NULL, NULL,
-          _empathy_marshal_VOID__STRING_OBJECT_OBJECT_UINT,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE,
           4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_UINT);
 
@@ -328,10 +347,10 @@ empathy_individual_manager_init (EmpathyIndividualManager *self)
 
   self->priv = priv;
   priv->individuals = g_hash_table_new_full (g_str_hash, g_str_equal,
-      NULL, g_object_unref);
+      g_free, g_object_unref);
 
   priv->aggregator = folks_individual_aggregator_new ();
-  g_signal_connect (priv->aggregator, "individuals-changed",
+  g_signal_connect (priv->aggregator, "individuals-changed-detailed",
       G_CALLBACK (aggregator_individuals_changed_cb), self);
   folks_individual_aggregator_prepare (priv->aggregator, NULL, NULL);
 }