[geary: 2/2] Merge branch 'wip/fast-folder-switching-crashes' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit d12edc298a3d755dee0457f942204169cec1b311
Merge: b9fc4881 76222c78
Author: Michael Gratton <mike vee net>
Date:   Sun Apr 21 07:00:09 2019 +0000

    Merge branch 'wip/fast-folder-switching-crashes' into 'mainline'
    
    Both check for and throw Cancelled errors some more
    
    See merge request GNOME/geary!218

 src/client/application/application-contact-store.vala  | 9 +++++----
 src/client/conversation-viewer/conversation-email.vala | 8 ++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)
---