[geary: 3/66] Merge branch 'mainline' into remove-old-msgs-beyond-storage-pref

[Michael Gratton <mjog src gnome org>]

commit d77f5d9fcc75ce8d4a568502e336b36f78ea8e7f
Merge: dbb1d783a c9d6d9666
Author: Chris Heywood <15127-creywood users noreply gitlab gnome org>
Date:   Wed Dec 18 12:09:53 2019 +0100

    Merge branch 'mainline' into remove-old-msgs-beyond-storage-pref

 po/POTFILES.in                                     |  11 +-
 src/client/application/application-controller.vala |  10 +-
 .../application/application-main-window.vala       |  93 +--
 src/client/components/components-search-bar.vala   |  92 +++
 src/client/components/search-bar.vala              | 131 -----
 .../conversation-viewer/conversation-message.vala  |   4 +-
 .../conversation-viewer/conversation-viewer.vala   |  22 +-
 .../folder-list/folder-list-search-branch.vala     |   8 +-
 src/client/folder-list/folder-list-tree.vala       |   2 +-
 src/client/meson.build                             |   2 +-
 src/client/util/util-email.vala                    |   9 -
 src/client/util/util-gtk.vala                      |   9 +
 src/engine/api/geary-account.vala                  |  38 +-
 src/engine/api/geary-email-identifier.vala         |  30 +-
 src/engine/api/geary-folder.vala                   |  13 -
 src/engine/api/geary-search-folder.vala            |  81 ---
 src/engine/api/geary-search-query.vala             |  35 +-
 src/engine/app/app-search-folder.vala              | 632 +++++++++++++++++++++
 src/engine/imap-db/imap-db-account.vala            |  77 ++-
 src/engine/imap-db/imap-db-email-identifier.vala   |  38 +-
 .../imap-db/{search => }/imap-db-search-query.vala |  96 +++-
 .../search/imap-db-search-email-identifier.vala    |  75 ---
 .../search/imap-db-search-folder-properties.vala   |  16 -
 .../imap-db/search/imap-db-search-folder.vala      | 423 --------------
 src/engine/imap-db/search/imap-db-search-term.vala |  62 --
 .../gmail/imap-engine-gmail-account.vala           |   4 -
 .../gmail/imap-engine-gmail-search-folder.vala     |  46 --
 .../imap-engine/imap-engine-generic-account.vala   | 136 ++---
 .../imap-engine/imap-engine-minimal-folder.vala    |  25 +-
 .../replay-ops/imap-engine-mark-email.vala         |   8 +-
 .../replay-ops/imap-engine-move-email-prepare.vala |   5 +-
 .../replay-ops/imap-engine-remove-email.vala       |   5 +-
 src/engine/meson.build                             |   9 +-
 src/engine/outbox/outbox-email-identifier.vala     |  36 +-
 src/engine/outbox/outbox-folder.vala               |  31 -
 test/engine/api/geary-account-mock.vala            |  25 +-
 test/engine/api/geary-email-identifier-mock.vala   |  26 +-
 test/engine/api/geary-folder-mock.vala             |   7 -
 test/engine/imap-db/imap-db-account-test.vala      |  57 ++
 .../imap-engine-generic-account-test.vala          |  12 +-
 40 files changed, 1254 insertions(+), 1187 deletions(-)
---