diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2011-05-13 22:18:57 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2011-05-13 22:25:15 +0800 |
| commit | 4d140c3a4e3c4629a72c3bf0ea7ca8b8ee48fb72 (patch) | |
| tree | f51e42f58c7e4a63061bdcb82c0b27f45b29fdbb | |
| parent | d44680728465f8bb4da6f6dd50694d04aadd1745 (diff) | |
| download | gsoc2013-empathy-4d140c3a4e3c4629a72c3bf0ea7ca8b8ee48fb72.tar gsoc2013-empathy-4d140c3a4e3c4629a72c3bf0ea7ca8b8ee48fb72.tar.gz gsoc2013-empathy-4d140c3a4e3c4629a72c3bf0ea7ca8b8ee48fb72.tar.bz2 gsoc2013-empathy-4d140c3a4e3c4629a72c3bf0ea7ca8b8ee48fb72.tar.lz gsoc2013-empathy-4d140c3a4e3c4629a72c3bf0ea7ca8b8ee48fb72.tar.xz gsoc2013-empathy-4d140c3a4e3c4629a72c3bf0ea7ca8b8ee48fb72.tar.zst gsoc2013-empathy-4d140c3a4e3c4629a72c3bf0ea7ca8b8ee48fb72.zip | |
tp-chat: rename signal to message-acknowledged
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 12 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 897127b28..09698bc72 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -1293,9 +1293,9 @@ chat_message_received_cb (EmpathyTpChat *tp_chat, } static void -chat_pending_message_removed_cb (EmpathyTpChat *tp_chat, - EmpathyMessage *message, - EmpathyChat *chat) +chat_message_acknowledged_cb (EmpathyTpChat *tp_chat, + EmpathyMessage *message, + EmpathyChat *chat) { EmpathyChatPriv *priv = GET_PRIV (chat); @@ -2895,7 +2895,7 @@ chat_finalize (GObject *object) g_signal_handlers_disconnect_by_func (priv->tp_chat, chat_message_received_cb, chat); g_signal_handlers_disconnect_by_func (priv->tp_chat, - chat_pending_message_removed_cb, chat); + chat_message_acknowledged_cb, chat); g_signal_handlers_disconnect_by_func (priv->tp_chat, chat_send_error_cb, chat); g_signal_handlers_disconnect_by_func (priv->tp_chat, @@ -3579,8 +3579,8 @@ empathy_chat_set_tp_chat (EmpathyChat *chat, g_signal_connect (tp_chat, "message-received", G_CALLBACK (chat_message_received_cb), chat); - g_signal_connect (tp_chat, "pending-message-removed", - G_CALLBACK (chat_pending_message_removed_cb), + g_signal_connect (tp_chat, "message_acknowledged", + G_CALLBACK (chat_message_acknowledged_cb), chat); g_signal_connect (tp_chat, "send-error", G_CALLBACK (chat_send_error_cb), diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index de15a968b..1d3dca765 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -84,7 +84,7 @@ enum { CHAT_STATE_CHANGED, PROPERTY_CHANGED, DESTROY, - PENDING_MESSAGE_REMOVED, + MESSAGE_ACKNOWLEDGED, LAST_SIGNAL }; @@ -479,7 +479,7 @@ pending_message_removed_cb (TpTextChannel *channel, find_pending_message_func); g_assert (m != NULL); - g_signal_emit (chat, signals[PENDING_MESSAGE_REMOVED], 0, m->data); + g_signal_emit (chat, signals[MESSAGE_ACKNOWLEDGED], 0, m->data); g_object_unref (m->data); g_queue_delete_link (priv->pending_messages_queue, m); @@ -1666,8 +1666,8 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass) G_TYPE_NONE, 0); - signals[PENDING_MESSAGE_REMOVED] = - g_signal_new ("pending-message-removed", + signals[MESSAGE_ACKNOWLEDGED] = + g_signal_new ("message-acknowledged", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, |