diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-04-18 20:48:47 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-04-21 10:36:04 +0800 |
| commit | 2eef25ba493b49772b0698ee6b8bb0215f1ae450 (patch) | |
| tree | 6d138f0d86c09148d4d02860c6c264e8819c85ca | |
| parent | ed73feac020087a75eb96d8bedff7d3b38670080 (diff) | |
| download | gsoc2013-empathy-2eef25ba493b49772b0698ee6b8bb0215f1ae450.tar gsoc2013-empathy-2eef25ba493b49772b0698ee6b8bb0215f1ae450.tar.gz gsoc2013-empathy-2eef25ba493b49772b0698ee6b8bb0215f1ae450.tar.bz2 gsoc2013-empathy-2eef25ba493b49772b0698ee6b8bb0215f1ae450.tar.lz gsoc2013-empathy-2eef25ba493b49772b0698ee6b8bb0215f1ae450.tar.xz gsoc2013-empathy-2eef25ba493b49772b0698ee6b8bb0215f1ae450.tar.zst gsoc2013-empathy-2eef25ba493b49772b0698ee6b8bb0215f1ae450.zip | |
use the TpChannel:chat-state-changed signal
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index cfc9735dd..e829d6e6b 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -486,14 +486,13 @@ static void tp_chat_state_changed_cb (TpChannel *channel, TpHandle handle, TpChannelChatState state, - gpointer user_data, - GObject *chat) + EmpathyTpChat *chat) { EmpathyTpChatPriv *priv = GET_PRIV (chat); empathy_tp_contact_factory_get_from_handle (priv->connection, handle, tp_chat_state_changed_got_contact_cb, GUINT_TO_POINTER (state), - NULL, chat); + NULL, G_OBJECT (chat)); } static void @@ -853,10 +852,8 @@ check_almost_ready (EmpathyTpChat *chat) tp_g_signal_connect_object (priv->channel, "message-sent", G_CALLBACK (message_sent_cb), chat, 0); - tp_cli_channel_interface_chat_state_connect_to_chat_state_changed (priv->channel, - tp_chat_state_changed_cb, - NULL, NULL, - G_OBJECT (chat), NULL); + tp_g_signal_connect_object (priv->channel, "chat-state-changed", + G_CALLBACK (tp_chat_state_changed_cb), chat, 0); check_ready (chat); } |