diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2009-08-31 08:15:41 +0800 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2009-08-31 08:18:14 +0800 |
| commit | ad59f77dfdba77af558ae2d278c92b0a7ab747d7 (patch) | |
| tree | 7f219c54bdf97c7e206d155ec307e8068dd14246 /libempathy/empathy-tp-chat.c | |
| parent | 2150f8ae4242fe2a26f29c96ddeb27ace1fe90fd (diff) | |
| download | gsoc2013-empathy-ad59f77dfdba77af558ae2d278c92b0a7ab747d7.tar gsoc2013-empathy-ad59f77dfdba77af558ae2d278c92b0a7ab747d7.tar.gz gsoc2013-empathy-ad59f77dfdba77af558ae2d278c92b0a7ab747d7.tar.bz2 gsoc2013-empathy-ad59f77dfdba77af558ae2d278c92b0a7ab747d7.tar.lz gsoc2013-empathy-ad59f77dfdba77af558ae2d278c92b0a7ab747d7.tar.xz gsoc2013-empathy-ad59f77dfdba77af558ae2d278c92b0a7ab747d7.tar.zst gsoc2013-empathy-ad59f77dfdba77af558ae2d278c92b0a7ab747d7.zip | |
Ack received messages from ourself.
Sumana Harihareswara reported that she had started a conversation with
herself, sent a message, and then tried to close the window, but
whenever she did so it reappeared.
This was because Empathy did not acknowledge "incoming" messages from
the user themself; hence, when it Close()d the channel, Gabble respawned
it, because it still had pending messages.
Diffstat (limited to 'libempathy/empathy-tp-chat.c')
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 7429e1ddc..a64f06a2f 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -227,6 +227,7 @@ tp_chat_got_sender_cb (EmpathyTpContactFactory *factory, static void tp_chat_build_message (EmpathyTpChat *chat, + gboolean incoming, guint id, guint type, guint timestamp, @@ -243,6 +244,8 @@ tp_chat_build_message (EmpathyTpChat *chat, empathy_message_set_receiver (message, priv->user); empathy_message_set_timestamp (message, timestamp); empathy_message_set_id (message, id); + empathy_message_set_incoming (message, incoming); + g_queue_push_tail (priv->messages_queue, message); if (from_handle == 0) { @@ -294,6 +297,7 @@ tp_chat_received_cb (TpChannel *channel, } tp_chat_build_message (chat, + TRUE, message_id, message_type, timestamp, @@ -318,6 +322,7 @@ tp_chat_sent_cb (TpChannel *channel, DEBUG ("Message sent: %s", message_body); tp_chat_build_message (chat, + FALSE, 0, message_type, timestamp, @@ -456,6 +461,7 @@ tp_chat_list_pending_messages_cb (TpChannel *channel, } tp_chat_build_message (chat, + TRUE, message_id, message_type, timestamp, @@ -1369,7 +1375,7 @@ empathy_tp_chat_acknowledge_message (EmpathyTpChat *chat, g_return_if_fail (EMPATHY_IS_TP_CHAT (chat)); g_return_if_fail (priv->ready); - if (empathy_message_get_sender (message) == priv->user) + if (!empathy_message_is_incoming (message)) goto out; message_ids = g_array_sized_new (FALSE, FALSE, sizeof (guint), 1); @@ -1415,7 +1421,7 @@ empathy_tp_chat_acknowledge_messages (EmpathyTpChat *chat, g_assert (m != NULL); g_queue_delete_link (priv->pending_messages_queue, m); - if (empathy_message_get_sender (message) != priv->user) { + if (empathy_message_is_incoming (message)) { guint id = empathy_message_get_id (message); g_array_append_val (message_ids, id); } |