[geary/gnome-3-32: 2/2] Merge branch 'cherry-pick-dc656d7a' into 'gnome-3-32'

[Michael Gratton <mjog src gnome org>]

commit fb3672f55b39c935206151e6461bc07e54247c09
Merge: e7209ffe 1fa7eb81
Author: Michael Gratton <mike vee net>
Date:   Wed Apr 24 02:35:00 2019 +0000

    Merge branch 'cherry-pick-dc656d7a' into 'gnome-3-32'
    
    Fix ConversationMonitor sometimes not loading more from remote
    
    See merge request GNOME/geary!197

 src/client/application/geary-controller.vala       |  9 +++--
 .../conversation-list/conversation-list-view.vala  | 46 +++++++++-------------
 src/engine/app/app-conversation-monitor.vala       | 29 +++++++++++---
 .../app-fill-window-operation.vala                 | 10 +++--
 .../conversation-monitor/app-insert-operation.vala |  3 --
 .../conversation-monitor/app-remove-operation.vala |  6 ---
 src/engine/imap-db/imap-db-folder.vala             | 29 ++++++++------
 .../imap-engine/imap-engine-generic-account.vala   |  4 +-
 test/engine/api/geary-folder-mock.vala             |  2 +-
 test/engine/api/geary-folder-properties-mock.vala  | 24 +++++++++++
 test/engine/app/app-conversation-monitor-test.vala |  3 --
 test/meson.build                                   |  1 +
 12 files changed, 100 insertions(+), 66 deletions(-)
---