aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-12-02 22:12:41 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-12-02 22:12:43 +0800
commitb82b08de181b134cde387c0e634b8f5afc53a201 (patch)
tree4b6464597fef47db022adc1fe6b1208a3bda3646
parent3ea940ebbbc219521ce3674a703fe036aebd96bb (diff)
downloadgsoc2013-empathy-b82b08de181b134cde387c0e634b8f5afc53a201.tar
gsoc2013-empathy-b82b08de181b134cde387c0e634b8f5afc53a201.tar.gz
gsoc2013-empathy-b82b08de181b134cde387c0e634b8f5afc53a201.tar.bz2
gsoc2013-empathy-b82b08de181b134cde387c0e634b8f5afc53a201.tar.lz
gsoc2013-empathy-b82b08de181b134cde387c0e634b8f5afc53a201.tar.xz
gsoc2013-empathy-b82b08de181b134cde387c0e634b8f5afc53a201.tar.zst
gsoc2013-empathy-b82b08de181b134cde387c0e634b8f5afc53a201.zip
chat-manager: stop telling the chat mgr about handled rooms
Now that the chat handler has moved to its own process this is no longer enough. The instance of the chat manager in empathy doesn't know about the handlded channels. The chat manager should implement an Observer instead to know about all the rooms.
-rw-r--r--src/empathy-chat-manager.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 946aecb97..38c91fa4d 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -100,22 +100,6 @@ chat_data_free (ChatData *data)
}
static void
-tell_chatroom_manager_if_needed (EmpathyChatManager *self,
- TpAccount *account,
- EmpathyTpChat *chat)
-{
- EmpathyChatManagerPriv *priv = GET_PRIV (self);
- TpHandleType type;
-
- tp_channel_get_handle (empathy_tp_chat_get_channel (chat), &type);
-
- if (type == TP_HANDLE_TYPE_ROOM)
- {
- empathy_chatroom_manager_chat_handled (priv->chatroom_mgr, chat, account);
- }
-}
-
-static void
process_tp_chat (EmpathyChatManager *self,
EmpathyTpChat *tp_chat,
TpAccount *account,
@@ -124,8 +108,6 @@ process_tp_chat (EmpathyChatManager *self,
EmpathyChat *chat = NULL;
const gchar *id;
- tell_chatroom_manager_if_needed (self, account, tp_chat);
-
id = empathy_tp_chat_get_id (tp_chat);
if (!tp_str_empty (id))
{