[geary/geary-0.13] Merge branch 'wip/no-avatars' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 738fbb37ae640b26b98f2f9453ed14ec4e59bea4
Author: Michael Gratton <mike vee net>
Date:   Wed Feb 27 01:05:25 2019 +0000

    Merge branch 'wip/no-avatars' into 'master'
    
    Fix avatars rarely being loaded by the conversation viewer
    
    See merge request GNOME/geary!146
    
    (cherry picked from commit a0aa46b53492a6be2d38cdeea03557b94b546381)
    
    8d774bea Fix avatars rarely being loaded by the conversation viewer

 src/client/conversation-viewer/conversation-list-box.vala | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/src/client/conversation-viewer/conversation-list-box.vala 
b/src/client/conversation-viewer/conversation-list-box.vala
index 7c3ad97d..a4250f39 100644
--- a/src/client/conversation-viewer/conversation-list-box.vala
+++ b/src/client/conversation-viewer/conversation-list-box.vala
@@ -637,6 +637,7 @@ public class ConversationListBox : Gtk.ListBox, Geary.BaseInterface {
 
         // Load the interesting row completely up front, and load the
         // remaining in the background so we can return fast.
+        interesting_row.view.load_avatar.begin(this.avatar_store);
         yield interesting_row.expand();
         this.finish_loading.begin(
             query, uninteresting, post_interesting
@@ -795,6 +796,7 @@ public class ConversationListBox : Gtk.ListBox, Geary.BaseInterface {
         // filling the empty space.
         foreach (Geary.Email email in to_append) {
             EmailRow row = add_email(email);
+            yield row.view.load_avatar(this.avatar_store);
             if (is_interesting(email)) {
                 yield row.expand();
             }
@@ -828,6 +830,7 @@ public class ConversationListBox : Gtk.ListBox, Geary.BaseInterface {
             // Only adjust for the loading row going away once
             loading_height = 0;
 
+            yield row.view.load_avatar(this.avatar_store);
             yield throttle_loading();
         }
 
@@ -877,7 +880,7 @@ public class ConversationListBox : Gtk.ListBox, Geary.BaseInterface {
 
         if (!this.cancellable.is_cancelled()) {
             EmailRow row = add_email(full_email);
-            row.view.load_avatar.begin(this.avatar_store);
+            yield row.view.load_avatar(this.avatar_store);
             this.search.highlight_row_if_matching(row);
             yield row.expand();
         }