[geary: 9/9] Merge branch 'wip/search-cleanup' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 82c1e640a705019538f742c6f0811bfc24228e68
Merge: 55a6d79f beccdd49
Author: Michael Gratton <mike vee net>
Date:   Thu Feb 7 10:50:33 2019 +0000

    Merge branch 'wip/search-cleanup' into 'master'
    
    Search cleanup
    
    See merge request GNOME/geary!97

 src/client/application/geary-controller.vala       |  10 +-
 .../conversation-viewer/conversation-email.vala    |   4 +
 .../conversation-viewer/conversation-list-box.vala | 315 +++++++++++++--------
 .../conversation-viewer/conversation-message.vala  |  11 +-
 .../conversation-viewer/conversation-viewer.vala   |  14 +-
 .../conversation-viewer/conversation-web-view.vala |  36 ++-
 .../app-conversation-operation.vala                |   2 +-
 .../conversation-monitor/app-insert-operation.vala |   2 +-
 src/engine/imap-db/imap-db-account.vala            | 201 ++++++-------
 9 files changed, 359 insertions(+), 236 deletions(-)
---