diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-04-29 15:20:02 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-05-25 15:22:41 +0800 |
commit | 5079e73c8edf3b460ed11edc02ffb2cb6b705eac (patch) | |
tree | 57d3161a40048d6cc2eeb18dd4287100df61c2cc /libempathy/empathy-chatroom-manager.c | |
parent | e74a36868d7abe9c8559567cd4e6d82ce24469af (diff) | |
download | gsoc2013-empathy-5079e73c8edf3b460ed11edc02ffb2cb6b705eac.tar gsoc2013-empathy-5079e73c8edf3b460ed11edc02ffb2cb6b705eac.tar.gz gsoc2013-empathy-5079e73c8edf3b460ed11edc02ffb2cb6b705eac.tar.bz2 gsoc2013-empathy-5079e73c8edf3b460ed11edc02ffb2cb6b705eac.tar.lz gsoc2013-empathy-5079e73c8edf3b460ed11edc02ffb2cb6b705eac.tar.xz gsoc2013-empathy-5079e73c8edf3b460ed11edc02ffb2cb6b705eac.tar.zst gsoc2013-empathy-5079e73c8edf3b460ed11edc02ffb2cb6b705eac.zip |
EmpathyTpChat: get rid of the destroy signal
We should just use invalidated.
Diffstat (limited to 'libempathy/empathy-chatroom-manager.c')
-rw-r--r-- | libempathy/empathy-chatroom-manager.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c index 00b54200f..212c5d8ef 100644 --- a/libempathy/empathy-chatroom-manager.c +++ b/libempathy/empathy-chatroom-manager.c @@ -840,7 +840,10 @@ empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager, } static void -chatroom_manager_chat_destroyed_cb (EmpathyTpChat *chat, +chatroom_manager_chat_invalidated_cb (EmpathyTpChat *chat, + guint domain, + gint code, + gchar *message, gpointer manager) { EmpathyChatroomManagerPriv *priv = GET_PRIV (manager); @@ -905,10 +908,8 @@ observe_channels_cb (TpSimpleObserver *observer, empathy_chatroom_set_tp_chat (chatroom, tp_chat); - /* A TpChat is always destroyed as it only gets unreffed after the channel - * has been invalidated in the dispatcher.. */ - g_signal_connect (tp_chat, "destroy", - G_CALLBACK (chatroom_manager_chat_destroyed_cb), + g_signal_connect (tp_chat, "invalidated", + G_CALLBACK (chatroom_manager_chat_invalidated_cb), self); } |