[empathy: 2/3] moving retrieving_backlog = FALSE right before empathy_chat_messages_read()
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 2/3] moving retrieving_backlog = FALSE right before empathy_chat_messages_read()
- Date: Fri, 26 Feb 2010 08:49:34 +0000 (UTC)
commit 28244a9c41e2c4274d2cb298c20b5e8909f7578a
Author: Cosimo Alfarano <cosimo alfarano collabora co uk>
Date: Thu Feb 25 19:15:15 2010 +0000
moving retrieving_backlog = FALSE right before empathy_chat_messages_read()
or it will allow race conditions
libempathy-gtk/empathy-chat.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 2c563c6..edb2aab 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -1838,13 +1838,13 @@ got_filtered_messages_cb (GObject *manager,
g_list_free (messages);
out:
- priv->retrieving_backlogs = FALSE;
/* in case of TPL error, skip backlog and show pending messages */
priv->can_show_pending = TRUE;
show_pending_messages (chat);
/* FIXME: See Bug#610994, we are forcing the ACK of the queue. See comments
* about it in EmpathyChatPriv definition */
+ priv->retrieving_backlogs = FALSE;
empathy_chat_messages_read (chat);
/* Turn back on scrolling */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]