From 28244a9c41e2c4274d2cb298c20b5e8909f7578a Mon Sep 17 00:00:00 2001 From: Cosimo Alfarano Date: Thu, 25 Feb 2010 19:15:15 +0000 Subject: [PATCH] moving retrieving_backlog = FALSE right before empathy_chat_messages_read() or it will allow race conditions --- libempathy-gtk/empathy-chat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 2c563c66..edb2aabc 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 */ -- 2.39.2