diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-05 16:58:55 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-05 16:58:55 +0800 |
| commit | b07f3a5c948066219cb57bb113a48d0981106f23 (patch) | |
| tree | af507014db8e7d565fe812d938f862f854a86a35 /src | |
| parent | d88eaef098d3afc329266f25ce194c6dfebbc979 (diff) | |
| download | gsoc2013-empathy-b07f3a5c948066219cb57bb113a48d0981106f23.tar gsoc2013-empathy-b07f3a5c948066219cb57bb113a48d0981106f23.tar.gz gsoc2013-empathy-b07f3a5c948066219cb57bb113a48d0981106f23.tar.bz2 gsoc2013-empathy-b07f3a5c948066219cb57bb113a48d0981106f23.tar.lz gsoc2013-empathy-b07f3a5c948066219cb57bb113a48d0981106f23.tar.xz gsoc2013-empathy-b07f3a5c948066219cb57bb113a48d0981106f23.tar.zst gsoc2013-empathy-b07f3a5c948066219cb57bb113a48d0981106f23.zip | |
Inform the chatroom mgr when we are handling a new room
It can't rely on the internal dispatcher any more.
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat-manager.c | 10 | ||||
| -rw-r--r-- | src/empathy.c | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index aceaa5e68..c8d5891f6 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -19,6 +19,7 @@ #include <telepathy-glib/telepathy-glib.h> +#include <libempathy/empathy-chatroom-manager.h> #include <libempathy/empathy-dispatcher.h> #include "empathy-chat-window.h" @@ -128,6 +129,15 @@ process_tp_chat (EmpathyTpChat *tp_chat, empathy_tp_chat_join (tp_chat); } + if (empathy_chat_is_room (chat)) + { + EmpathyChatroomManager *chatroom_mgr; + + chatroom_mgr = empathy_chatroom_manager_dup_singleton (NULL); + empathy_chatroom_manager_chat_handled (chatroom_mgr, tp_chat, account); + g_object_unref (chatroom_mgr); + } + g_object_unref (tp_chat); } diff --git a/src/empathy.c b/src/empathy.c index a148c9796..81ff77c17 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -574,7 +574,6 @@ main (int argc, char *argv[]) log_manager = tpl_log_manager_dup_singleton (); chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL); - empathy_chatroom_manager_observe (chatroom_manager, dispatcher); g_object_get (chatroom_manager, "ready", &chatroom_manager_ready, NULL); if (!chatroom_manager_ready) |