[geary/gnome-3-38: 2/2] Merge branch 'cherry-pick-03f05c64' into 'gnome-3-38'

[Michael Gratton <mjog src gnome org>]

commit ed0adfa4b446e8bcc02944e0ffa72ff257671fc0
Merge: 74b84ff4f b66ccafc0
Author: Michael Gratton <mike vee net>
Date:   Sun Oct 4 08:06:08 2020 +0000

    Merge branch 'cherry-pick-03f05c64' into 'gnome-3-38'
    
    Merge branch 'mjog/986-namespace-assert' into 'gnome-3-38'
    
    See merge request GNOME/geary!596

 src/engine/imap/api/imap-account-session.vala      |  10 +-
 src/engine/imap/api/imap-client-service.vala       |  38 +++---
 src/engine/imap/api/imap-folder-session.vala       |  39 +++++--
 src/engine/imap/api/imap-session-object.vala       |  42 ++++---
 src/engine/imap/transport/imap-client-session.vala | 130 ++++++++++++---------
 src/engine/imap/transport/imap-deserializer.vala   |   4 +-
 src/engine/state/state-machine.vala                |  37 ++----
 .../imap/transport/imap-client-session-test.vala   |  40 +++----
 test/integration/imap/client-session.vala          |   2 +-
 9 files changed, 194 insertions(+), 148 deletions(-)
---