aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonnylamb@gnome.org>2011-05-13 18:35:09 +0800
committerJonny Lamb <jonnylamb@gnome.org>2011-05-13 22:25:15 +0800
commit96345c97d9c3fc52b45ef5ce522ef2e4c94bca63 (patch)
treeb7d074c5b70f54672b87e775cb4f089fd74b1cbc
parent5080aa2351deb6abe0aa1cc442fd1175f2eaa70e (diff)
downloadgsoc2013-empathy-96345c97d9c3fc52b45ef5ce522ef2e4c94bca63.tar
gsoc2013-empathy-96345c97d9c3fc52b45ef5ce522ef2e4c94bca63.tar.gz
gsoc2013-empathy-96345c97d9c3fc52b45ef5ce522ef2e4c94bca63.tar.bz2
gsoc2013-empathy-96345c97d9c3fc52b45ef5ce522ef2e4c94bca63.tar.lz
gsoc2013-empathy-96345c97d9c3fc52b45ef5ce522ef2e4c94bca63.tar.xz
gsoc2013-empathy-96345c97d9c3fc52b45ef5ce522ef2e4c94bca63.tar.zst
gsoc2013-empathy-96345c97d9c3fc52b45ef5ce522ef2e4c94bca63.zip
tp-chat: give ::pending-message-removed the message
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
-rw-r--r--libempathy-gtk/empathy-chat.c1
-rw-r--r--libempathy/empathy-tp-chat.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 019064a16..71e56203d 100644
--- 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 c83db01a1..de15a968b 100644
--- 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));
}