moving retrieving_backlog = FALSE right before empathy_chat_messages_read()

or it will allow race conditions

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 2c563c665005f2f4133619732807dfc33f5bf049..edb2aabc36abd89731ad0c51b9636914afb65b28 100644 (file)
--- 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 */