[geary: 2/2] Merge branch 'wip/remove_present_workaround' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 5dc6994706cbd0fb0204578e55321387155a5f25
Merge: 9e441882 e5775bb6
Author: Michael Gratton <mike vee net>
Date:   Fri Apr 19 03:59:55 2019 +0000

    Merge branch 'wip/remove_present_workaround' into 'mainline'
    
    Remove workaround for gtk_window_present_with_time() under Wayland
    
    See merge request GNOME/geary!179

 meson.build                                   |  2 +-
 src/client/application/geary-application.vala | 29 ++++++++++-----------------
 src/client/application/geary-controller.vala  |  6 ++----
 src/client/composer/composer-container.vala   |  7 +------
 4 files changed, 15 insertions(+), 29 deletions(-)
---