[geary/gnome-3-34: 2/2] Merge branch 'cherry-pick-08ea87ce' into 'gnome-3-34'

[Michael Gratton <mjog src gnome org>]

commit 1ee799bc88e8f7a54380f159534874e8692b7f67
Merge: 793f2f3e 15f9ad33
Author: Michael Gratton <mike vee net>
Date:   Sat Nov 23 04:35:21 2019 +0000

    Merge branch 'cherry-pick-08ea87ce' into 'gnome-3-34'
    
    Merge branch 'mjog/fix-email-id-from-variant' into 'gnome-3-34'
    
    See merge request GNOME/geary!355

 src/engine/api/geary-email-identifier.vala         |  7 +-
 .../imap-engine/imap-engine-generic-account.vala   | 12 +--
 src/engine/outbox/outbox-email-identifier.vala     |  2 +-
 .../imap-engine-generic-account-test.vala          | 96 ++++++++++++++++++++++
 test/meson.build                                   |  1 +
 test/test-engine.vala                              |  1 +
 6 files changed, 111 insertions(+), 8 deletions(-)
---