aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTravis Reitter <travis.reitter@collabora.co.uk>2010-10-13 14:22:23 +0800
committerTravis Reitter <travis.reitter@collabora.co.uk>2010-10-16 05:14:45 +0800
commit1291ec05478f211d37479fc98904d9d3dda743b0 (patch)
tree47b226e5903a19da1f112f06903c82fda07b3eca
parentf5f2d3a1cf71a4fc89c517a15d1413bfd1bfcac5 (diff)
downloadgsoc2013-empathy-1291ec05478f211d37479fc98904d9d3dda743b0.tar
gsoc2013-empathy-1291ec05478f211d37479fc98904d9d3dda743b0.tar.gz
gsoc2013-empathy-1291ec05478f211d37479fc98904d9d3dda743b0.tar.bz2
gsoc2013-empathy-1291ec05478f211d37479fc98904d9d3dda743b0.tar.lz
gsoc2013-empathy-1291ec05478f211d37479fc98904d9d3dda743b0.tar.xz
gsoc2013-empathy-1291ec05478f211d37479fc98904d9d3dda743b0.tar.zst
gsoc2013-empathy-1291ec05478f211d37479fc98904d9d3dda743b0.zip
Remove obsolete ContactManager from IndividualManager.
Helps bgo#625969.
-rw-r--r--libempathy/empathy-individual-manager.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 9a1891d06..07295c8bd 100644
--- 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);