[geary: 7/7] Merge branch 'mjog/notfication-avatars' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 9b0f359b977fcf23d54fac7861e7ef21299489f8
Merge: 22ab242f 7d82d9de
Author: Michael Gratton <mike vee net>
Date:   Sat Mar 21 22:30:38 2020 +0000

    Merge branch 'mjog/notfication-avatars' into 'mainline'
    
    Notfication avatars
    
    See merge request GNOME/geary!451

 desktop/org.gnome.Geary.appdata.xml.in.in          |  1 +
 .../application/application-avatar-store.vala      |  5 +-
 src/client/application/application-client.vala     |  3 ++
 .../application/application-contact-store.vala     |  7 ++-
 src/client/application/application-contact.vala    | 15 ++++++
 src/client/application/application-controller.vala | 10 ++--
 .../conversation-contact-popover.vala              |  8 +--
 .../conversation-viewer/conversation-message.vala  | 11 ++--
 .../desktop-notifications.vala                     | 63 ++++++++++++++--------
 9 files changed, 81 insertions(+), 42 deletions(-)
---