Remove obsolete ContactManager from IndividualManager.

Helps bgo#625969.

diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 9a1891d06a815d0b916ac04a89a117bfa2db04fa..07295c8bd1c9d15fbe8b0ab8587b20311c37ed0e 100644 (file)
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -34,8 +34,6 @@
 #include <extensions/extensions.h>
 
 #include "empathy-individual-manager.h"
-#include "empathy-contact-manager.h"
-#include "empathy-contact-list.h"
 #include "empathy-marshal.h"
 #include "empathy-utils.h"
 
@@ -51,7 +49,6 @@
 typedef struct
 {
   FolksIndividualAggregator *aggregator;
-  EmpathyContactManager *contact_manager;
   GHashTable *individuals; /* Individual.id -> Individual */
 } EmpathyIndividualManagerPriv;
 
@@ -222,7 +219,6 @@ individual_manager_dispose (GObject *object)
   EmpathyIndividualManagerPriv *priv = GET_PRIV (object);
 
   g_hash_table_destroy (priv->individuals);
-  tp_clear_object (&priv->contact_manager);
   tp_clear_object (&priv->aggregator);
 
   G_OBJECT_CLASS (empathy_individual_manager_parent_class)->dispose (object);
@@ -316,7 +312,6 @@ empathy_individual_manager_init (EmpathyIndividualManager *self)
       EMPATHY_TYPE_INDIVIDUAL_MANAGER, EmpathyIndividualManagerPriv);
 
   self->priv = priv;
-  priv->contact_manager = empathy_contact_manager_dup_singleton ();
   priv->individuals = g_hash_table_new_full (g_str_hash, g_str_equal,
       NULL, g_object_unref);