[geary: 2/2] Merge branch 'mjog/upgrade-dialog-cleanup' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 851f13d47fa780efbc04db07175256789d962def
Merge: 55081b008 c331145fd
Author: Michael Gratton <mike vee net>
Date:   Tue Jan 19 13:43:02 2021 +0000

    Merge branch 'mjog/upgrade-dialog-cleanup' into 'mainline'
    
    client: Clean up database upgrade dialog implementation
    
    Closes #1007
    
    See merge request GNOME/geary!634

 po/POTFILES.in                                     |   3 +-
 src/client/application/application-controller.vala |   8 +-
 .../application/application-database-manager.vala  | 118 +++++++++++++++++++++
 src/client/dialogs/upgrade-dialog.vala             |  95 -----------------
 src/client/meson.build                             |   2 +-
 ui/geary.css                                       |  10 ++
 ui/org.gnome.Geary.gresource.xml                   |   1 -
 ui/upgrade_dialog.glade                            | 113 --------------------
 8 files changed, 134 insertions(+), 216 deletions(-)
---