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

[Michael Gratton <mjog src gnome org>]

commit 22268616dbd52e43c250accbca48aeeef2e24d2c
Merge: 710dd09e1 1b8c9349c
Author: Michael Gratton <mike vee net>
Date:   Sun Oct 4 08:05:12 2020 +0000

    Merge branch 'cherry-pick-82f0ca8d' into 'gnome-3-38'
    
    Merge branch 'mjog/db-result-timing' into 'gnome-3-38'
    
    See merge request GNOME/geary!584

 src/engine/db/db-connection.vala                   |   5 +-
 src/engine/db/db-context.vala                      |  46 +++--
 src/engine/db/db-database-connection.vala          |  37 ++--
 src/engine/db/db-database.vala                     |  16 +-
 src/engine/db/db-result.vala                       |  53 +++---
 src/engine/db/db-statement.vala                    |  39 ++--
 src/engine/db/db-transaction-connection.vala       |  11 +-
 src/engine/imap-db/imap-db-account.vala            | 205 ++++++++++++---------
 src/engine/imap-db/imap-db-attachment.vala         |   2 +-
 src/engine/imap-db/imap-db-folder.vala             |   2 +-
 .../imap-engine/imap-engine-generic-account.vala   |   2 +
 11 files changed, 245 insertions(+), 173 deletions(-)
---