tp-chat: give ::pending-message-removed the message

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

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 019064a161c65c766a9e94b1544b90cc54e0edfe..71e56203d2fd64c3ca290abf19949d687d338135 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -1293,6 +1293,7 @@ chat_message_received_cb (EmpathyTpChat  *tp_chat,
 
 static void
 chat_pending_message_removed_cb (EmpathyTpChat  *tp_chat,
+                                EmpathyMessage *message,
                                 EmpathyChat    *chat)
 {
        EmpathyChatPriv *priv = GET_PRIV (chat);

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index c83db01a1c10a2ecaa3fac5641fe8c9d52439777..de15a968b00d4ab857c4aad048a14870e1750814 100644 (file)
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -479,10 +479,10 @@ 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_object_unref (m->data);
        g_queue_delete_link (priv->pending_messages_queue, m);
-
-       g_signal_emit (chat, signals[PENDING_MESSAGE_REMOVED], 0);
 }
 
 static void
@@ -1672,9 +1672,9 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID,
+                             g_cclosure_marshal_VOID__OBJECT,
                              G_TYPE_NONE,
-                             0);
+                             1, EMPATHY_TYPE_MESSAGE);
 
        g_type_class_add_private (object_class, sizeof (EmpathyTpChatPriv));
 }