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-gtk/empathy-chat.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-gtk/empathy-chat.c')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index cf3336bdf..1dbaf5d8a 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -2605,7 +2605,10 @@ chat_remote_contact_changed_cb (EmpathyChat *chat) } static void -chat_destroy_cb (EmpathyTpChat *tp_chat, +chat_invalidated_cb (EmpathyTpChat *tp_chat, + guint domain, + gint code, + gchar *message, EmpathyChat *chat) { EmpathyChatPriv *priv; @@ -2938,7 +2941,7 @@ chat_finalize (GObject *object) if (priv->tp_chat) { g_signal_handlers_disconnect_by_func (priv->tp_chat, - chat_destroy_cb, chat); + chat_invalidated_cb, chat); g_signal_handlers_disconnect_by_func (priv->tp_chat, chat_message_received_cb, chat); g_signal_handlers_disconnect_by_func (priv->tp_chat, @@ -3439,7 +3442,7 @@ password_entry_changed_cb (GtkEditable *entry, } static void -chat_invalidated_cb (TpProxy *proxy, +infobar_chat_invalidated_cb (TpProxy *proxy, guint domain, gint code, gchar *message, @@ -3533,7 +3536,7 @@ display_password_info_bar (EmpathyChat *self) gtk_widget_show_all (hbox); tp_g_signal_connect_object (priv->tp_chat, - "invalidated", G_CALLBACK (chat_invalidated_cb), + "invalidated", G_CALLBACK (infobar_chat_invalidated_cb), info_bar, 0); data->response_id = g_signal_connect (info_bar, "response", @@ -3648,8 +3651,8 @@ empathy_chat_set_tp_chat (EmpathyChat *chat, priv->tp_chat = g_object_ref (tp_chat); priv->account = g_object_ref (empathy_tp_chat_get_account (priv->tp_chat)); - g_signal_connect (tp_chat, "destroy", - G_CALLBACK (chat_destroy_cb), + g_signal_connect (tp_chat, "invalidated", + G_CALLBACK (chat_invalidated_cb), chat); g_signal_connect (tp_chat, "message-received-empathy", G_CALLBACK (chat_message_received_cb), |