From 1ea03406fc359c1623909ff6705c9c67b0e0c30b Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 23 May 2010 13:13:13 +0200 Subject: Remove EmpathyContactMonitor, it is not used anymore Fixes bug #619489 --- libempathy/empathy-contact-manager.c | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'libempathy/empathy-contact-manager.c') diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c index e0b51aafa..a900fa610 100644 --- a/libempathy/empathy-contact-manager.c +++ b/libempathy/empathy-contact-manager.c @@ -31,7 +31,6 @@ #include #include "empathy-contact-manager.h" -#include "empathy-contact-monitor.h" #include "empathy-contact-list.h" #include "empathy-utils.h" @@ -44,7 +43,6 @@ typedef struct { The contact list associated with each connected connection */ GHashTable *lists; TpAccountManager *account_manager; - EmpathyContactMonitor *contact_monitor; TpProxy *logger; /* account object path (gchar *) => GHashTable containing favorite contacts * (contact ID (gchar *) => TRUE) */ @@ -378,10 +376,6 @@ contact_manager_finalize (GObject *object) g_hash_table_destroy (priv->favourites); g_object_unref (priv->account_manager); - - if (priv->contact_monitor) { - g_object_unref (priv->contact_monitor); - } } static GObject * @@ -583,7 +577,6 @@ empathy_contact_manager_init (EmpathyContactManager *manager) g_hash_table_unref); priv->account_manager = tp_account_manager_dup (); - priv->contact_monitor = NULL; tp_account_manager_prepare_async (priv->account_manager, NULL, account_manager_prepared_cb, manager); @@ -698,18 +691,6 @@ contact_manager_get_members (EmpathyContactList *manager) return contacts; } -static EmpathyContactMonitor * -contact_manager_get_monitor (EmpathyContactList *manager) -{ - EmpathyContactManagerPriv *priv = GET_PRIV (manager); - - if (priv->contact_monitor == NULL) { - priv->contact_monitor = empathy_contact_monitor_new_for_iface (manager); - } - - return priv->contact_monitor; -} - static void contact_manager_get_pendings_foreach (TpConnection *connection, EmpathyTpContactList *list, @@ -889,7 +870,6 @@ contact_manager_iface_init (EmpathyContactListIface *iface) iface->add = contact_manager_add; iface->remove = contact_manager_remove; iface->get_members = contact_manager_get_members; - iface->get_monitor = contact_manager_get_monitor; iface->get_pendings = contact_manager_get_pendings; iface->get_all_groups = contact_manager_get_all_groups; iface->get_groups = contact_manager_get_groups; -- cgit v1.2.3