[empathy] Remove EmpathyContactMonitor, it is not used anymore

[Xavier Claessens <xclaesse src gnome org>]

commit 1ea03406fc359c1623909ff6705c9c67b0e0c30b
Author: Xavier Claessens <xclaesse gmail com>
Date:   Sun May 23 13:13:13 2010 +0200

    Remove EmpathyContactMonitor, it is not used anymore
    
    Fixes bug #619489

 libempathy/Makefile.am               |    2 -
 libempathy/empathy-contact-list.c    |   12 -
 libempathy/empathy-contact-list.h    |    4 -
 libempathy/empathy-contact-manager.c |   20 --
 libempathy/empathy-contact-monitor.c |  417 ----------------------------------
 libempathy/empathy-contact-monitor.h |   63 -----
 libempathy/empathy-tp-chat.c         |   24 --
 7 files changed, 0 insertions(+), 542 deletions(-)
---
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 1f14239..6d596be 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -36,7 +36,6 @@ libempathy_headers =				\
 	empathy-contact-groups.h		\
 	empathy-contact-list.h			\
 	empathy-contact-manager.h		\
-	empathy-contact-monitor.h		\
 	empathy-contact.h			\
 	empathy-debug.h				\
 	empathy-dispatch-operation.h		\
@@ -81,7 +80,6 @@ libempathy_la_SOURCES =					\
 	empathy-contact-groups.c			\
 	empathy-contact-list.c				\
 	empathy-contact-manager.c			\
-	empathy-contact-monitor.c			\
 	empathy-contact.c				\
 	empathy-debug.c					\
 	empathy-dispatch-operation.c			\
diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
index 0a3d361..5cbe1cb 100644
--- a/libempathy/empathy-contact-list.c
+++ b/libempathy/empathy-contact-list.c
@@ -143,18 +143,6 @@ empathy_contact_list_get_members (EmpathyContactList *list)
 	return NULL;
 }
 
-EmpathyContactMonitor *
-empathy_contact_list_get_monitor (EmpathyContactList *list)
-{
-	g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL);
-
-	if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_monitor) {
-		return EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_monitor (list);
-	}
-
-	return NULL;
-}
-
 GList *
 empathy_contact_list_get_pendings (EmpathyContactList *list)
 {
diff --git a/libempathy/empathy-contact-list.h b/libempathy/empathy-contact-list.h
index 8d2f445..3817af8 100644
--- a/libempathy/empathy-contact-list.h
+++ b/libempathy/empathy-contact-list.h
@@ -69,8 +69,6 @@ struct _EmpathyContactListIface {
 					       const gchar        *new_group);
 	void		 (*remove_group)      (EmpathyContactList *list,
 					       const gchar	  *group);
-	EmpathyContactMonitor *
-			 (*get_monitor)       (EmpathyContactList *list);
 	EmpathyContactListFlags
 			 (*get_flags)         (EmpathyContactList *list);
 	gboolean         (*is_favourite)      (EmpathyContactList *list,
@@ -104,8 +102,6 @@ void     empathy_contact_list_rename_group      (EmpathyContactList *list,
 						 const gchar        *new_group);
 void	 empathy_contact_list_remove_group	(EmpathyContactList *list,
 						 const gchar	    *group);
-EmpathyContactMonitor *
-         empathy_contact_list_get_monitor       (EmpathyContactList *list);
 
 EmpathyContactListFlags
          empathy_contact_list_get_flags		(EmpathyContactList *list);
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index e0b51aa..a900fa6 100644
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -31,7 +31,6 @@
 #include <extensions/extensions.h>
 
 #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;
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 4855102..daf24a3 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -29,7 +29,6 @@
 
 #include "empathy-tp-chat.h"
 #include "empathy-tp-contact-factory.h"
-#include "empathy-contact-monitor.h"
 #include "empathy-contact-list.h"
 #include "empathy-dispatcher.h"
 #include "empathy-marshal.h"
@@ -43,7 +42,6 @@
 typedef struct {
 	gboolean               dispose_has_run;
 	TpConnection          *connection;
-	EmpathyContactMonitor *contact_monitor;
 	EmpathyContact        *user;
 	EmpathyContact        *remote_contact;
 	GList                 *members;
@@ -205,22 +203,6 @@ tp_chat_get_members (EmpathyContactList *list)
 	return members;
 }
 
-static EmpathyContactMonitor *
-tp_chat_get_monitor (EmpathyContactList *list)
-{
-	EmpathyTpChatPriv *priv;
-
-	g_return_val_if_fail (EMPATHY_IS_TP_CHAT (list), NULL);
-
-	priv = GET_PRIV (list);
-
-	if (priv->contact_monitor == NULL) {
-		priv->contact_monitor = empathy_contact_monitor_new_for_iface (list);
-	}
-
-	return priv->contact_monitor;
-}
-
 static void
 tp_chat_emit_queued_messages (EmpathyTpChat *chat)
 {
@@ -775,10 +757,6 @@ tp_chat_dispose (GObject *object)
 		g_object_unref (priv->user);
 	priv->user = NULL;
 
-	if (priv->contact_monitor)
-		g_object_unref (priv->contact_monitor);
-	priv->contact_monitor = NULL;
-
 	g_queue_foreach (priv->messages_queue, (GFunc) g_object_unref, NULL);
 	g_queue_clear (priv->messages_queue);
 
@@ -1493,7 +1471,6 @@ empathy_tp_chat_init (EmpathyTpChat *chat)
 		EMPATHY_TYPE_TP_CHAT, EmpathyTpChatPriv);
 
 	chat->priv = priv;
-	priv->contact_monitor = NULL;
 	priv->messages_queue = g_queue_new ();
 	priv->pending_messages_queue = g_queue_new ();
 }
@@ -1504,7 +1481,6 @@ tp_chat_iface_init (EmpathyContactListIface *iface)
 	iface->add         = tp_chat_add;
 	iface->remove      = tp_chat_remove;
 	iface->get_members = tp_chat_get_members;
-	iface->get_monitor = tp_chat_get_monitor;
 }
 
 EmpathyTpChat *