diff options
| author | Debarshi Ray <debarshir@src.gnome.org> | 2012-07-09 23:45:01 +0800 |
|---|---|---|
| committer | Debarshi Ray <debarshir@src.gnome.org> | 2013-01-21 23:42:24 +0800 |
| commit | fba3739d9dccb9ccaa99d5ad8d07c5264ebbdeb2 (patch) | |
| tree | 91b914516527d5fba562bcb197184c4612ebb93d /libempathy-gtk | |
| parent | 027ccda384645f67a2d209d023c5d324d7f15715 (diff) | |
| download | gsoc2013-empathy-fba3739d9dccb9ccaa99d5ad8d07c5264ebbdeb2.tar gsoc2013-empathy-fba3739d9dccb9ccaa99d5ad8d07c5264ebbdeb2.tar.gz gsoc2013-empathy-fba3739d9dccb9ccaa99d5ad8d07c5264ebbdeb2.tar.bz2 gsoc2013-empathy-fba3739d9dccb9ccaa99d5ad8d07c5264ebbdeb2.tar.lz gsoc2013-empathy-fba3739d9dccb9ccaa99d5ad8d07c5264ebbdeb2.tar.xz gsoc2013-empathy-fba3739d9dccb9ccaa99d5ad8d07c5264ebbdeb2.tar.zst gsoc2013-empathy-fba3739d9dccb9ccaa99d5ad8d07c5264ebbdeb2.zip | |
empathy-chat: show pending messages only for the first set of logs
Fixes: https://bugzilla.gnome.org/639877
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index e9a914f36..1c0e11a3a 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -2635,10 +2635,6 @@ got_filtered_messages_cb (GObject *walker, g_list_free (messages); out: - /* 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; @@ -2655,6 +2651,11 @@ out: */ if (G_UNLIKELY (!priv->watch_scroll && !tpl_log_walker_is_end (priv->log_walker))) { + /* The pending messages need not be shown after the + * first batch of logs have been displayed */ + priv->can_show_pending = TRUE; + show_pending_messages (chat); + priv->watch_scroll = TRUE; g_idle_add_full (G_PRIORITY_LOW, chat_scrollable_connect, g_object_ref (chat), g_object_unref); |