diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2010-05-23 19:13:13 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2010-05-26 17:34:59 +0800 |
| commit | 1ea03406fc359c1623909ff6705c9c67b0e0c30b (patch) | |
| tree | 252682ece0b5fcbc093c5f7244957a83cea3f3ac /libempathy/empathy-tp-chat.c | |
| parent | a9b78b0a3a5fe71e3119016c9f438d3897509bf8 (diff) | |
| download | gsoc2013-empathy-1ea03406fc359c1623909ff6705c9c67b0e0c30b.tar gsoc2013-empathy-1ea03406fc359c1623909ff6705c9c67b0e0c30b.tar.gz gsoc2013-empathy-1ea03406fc359c1623909ff6705c9c67b0e0c30b.tar.bz2 gsoc2013-empathy-1ea03406fc359c1623909ff6705c9c67b0e0c30b.tar.lz gsoc2013-empathy-1ea03406fc359c1623909ff6705c9c67b0e0c30b.tar.xz gsoc2013-empathy-1ea03406fc359c1623909ff6705c9c67b0e0c30b.tar.zst gsoc2013-empathy-1ea03406fc359c1623909ff6705c9c67b0e0c30b.zip | |
Remove EmpathyContactMonitor, it is not used anymore
Fixes bug #619489
Diffstat (limited to 'libempathy/empathy-tp-chat.c')
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 485510214..daf24a36a 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 * |