aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCosimo Alfarano <cosimo.alfarano@collabora.co.uk>2010-02-26 03:15:15 +0800
committerCosimo Alfarano <cosimo.alfarano@collabora.co.uk>2010-02-26 03:15:15 +0800
commit28244a9c41e2c4274d2cb298c20b5e8909f7578a (patch)
tree70587e4f3ec7a0995102d3eddc18e59321b05e90
parent8d4d46e440c7a6bd321fc098265db8ede27c07de (diff)
downloadgsoc2013-empathy-28244a9c41e2c4274d2cb298c20b5e8909f7578a.tar
gsoc2013-empathy-28244a9c41e2c4274d2cb298c20b5e8909f7578a.tar.gz
gsoc2013-empathy-28244a9c41e2c4274d2cb298c20b5e8909f7578a.tar.bz2
gsoc2013-empathy-28244a9c41e2c4274d2cb298c20b5e8909f7578a.tar.lz
gsoc2013-empathy-28244a9c41e2c4274d2cb298c20b5e8909f7578a.tar.xz
gsoc2013-empathy-28244a9c41e2c4274d2cb298c20b5e8909f7578a.tar.zst
gsoc2013-empathy-28244a9c41e2c4274d2cb298c20b5e8909f7578a.zip
moving retrieving_backlog = FALSE right before empathy_chat_messages_read()
or it will allow race conditions
-rw-r--r--libempathy-gtk/empathy-chat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 2c563c665..edb2aabc3 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 */