tp-chat: rename signal to message-acknowledged

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 897127b28a7859c9122ff4f5bb5436dfab7c4d95..09698bc7259e62791d7cc508988a079d1263522f 100644 (file)
--- 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 de15a968b00d4ab857c4aad048a14870e1750814..1d3dca765bdbc81ad888c92023f845293868e729 100644 (file)
--- 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,