[geary: 19/23] Merge branch 'wip/789924-network-transition-redux'. Bug 789924.

[Michael Gratton <mjog src gnome org>]

commit 875bf462387489c119768e003ede148e4156bd94
Merge: 6c040c4 a6c7da4
Author: Michael James Gratton <mike vee net>
Date:   Thu Feb 8 09:59:52 2018 +1100

    Merge branch 'wip/789924-network-transition-redux'. Bug 789924.

 po/POTFILES.in                                     |    7 +-
 src/CMakeLists.txt                                 |    7 +-
 src/client/application/geary-controller.vala       |    1 -
 src/engine/api/geary-abstract-local-folder.vala    |    6 +-
 src/engine/api/geary-engine.vala                   |   30 +-
 src/engine/api/geary-folder.vala                   |  119 ++-
 src/engine/imap-db/imap-db-account.vala            |  251 +----
 src/engine/imap-db/imap-db-folder.vala             |  244 +++--
 .../gmail/imap-engine-gmail-account.vala           |   21 +-
 .../gmail/imap-engine-gmail-all-mail-folder.vala   |    9 +-
 .../gmail/imap-engine-gmail-drafts-folder.vala     |   11 +-
 .../gmail/imap-engine-gmail-folder.vala            |   31 +-
 .../gmail/imap-engine-gmail-spam-trash-folder.vala |   12 +-
 .../imap-engine-account-synchronizer.vala          |    2 +-
 .../imap-engine/imap-engine-generic-account.vala   |  766 +++++++++----
 .../imap-engine/imap-engine-generic-folder.vala    |    7 +-
 .../imap-engine/imap-engine-minimal-folder.vala    | 1214 ++++++++++----------
 .../imap-engine/imap-engine-replay-queue.vala      |   25 +-
 .../imap-engine-revokable-committed-move.vala      |   28 +-
 src/engine/imap-engine/imap-engine.vala            |   17 +
 .../other/imap-engine-other-account.vala           |   11 +-
 .../other/imap-engine-other-folder.vala            |    7 +-
 .../outlook/imap-engine-outlook-account.vala       |   12 +-
 .../outlook/imap-engine-outlook-drafts-folder.vala |    7 +-
 .../outlook/imap-engine-outlook-folder.vala        |    8 +-
 .../imap-engine-abstract-list-email.vala           |  117 ++-
 .../replay-ops/imap-engine-copy-email.vala         |   10 +-
 .../replay-ops/imap-engine-create-email.vala       |   19 +-
 .../replay-ops/imap-engine-empty-folder.vala       |   23 +-
 .../replay-ops/imap-engine-fetch-email.vala        |    7 +-
 .../replay-ops/imap-engine-mark-email.vala         |   12 +-
 .../replay-ops/imap-engine-move-email-commit.vala  |   43 +-
 .../replay-ops/imap-engine-move-email-prepare.vala |    7 +-
 .../replay-ops/imap-engine-move-email-revoke.vala  |    9 +-
 .../replay-ops/imap-engine-remove-email.vala       |   27 +-
 .../replay-ops/imap-engine-replay-append.vala      |   96 +-
 .../replay-ops/imap-engine-replay-disconnect.vala  |   65 --
 .../replay-ops/imap-engine-replay-removal.vala     |    9 +-
 .../imap-engine-server-search-email.vala           |   10 +-
 .../replay-ops/imap-engine-user-close.vala         |   43 +-
 .../yahoo/imap-engine-yahoo-account.vala           |   16 +-
 .../yahoo/imap-engine-yahoo-folder.vala            |    8 +-
 src/engine/imap/api/imap-account-session.vala      |  466 ++++++++
 src/engine/imap/api/imap-account.vala              |  717 ------------
 src/engine/imap/api/imap-folder-properties.vala    |  135 ++-
 src/engine/imap/api/imap-folder-session.vala       | 1092 ++++++++++++++++++
 src/engine/imap/api/imap-folder.vala               | 1114 +------------------
 src/engine/imap/api/imap-session-object.vala       |  102 ++
 .../imap/transport/imap-client-connection.vala     |   42 +-
 .../transport/imap-client-session-manager.vala     |   77 +-
 src/engine/imap/transport/imap-client-session.vala |  108 +-
 src/engine/meson.build                             |    7 +-
 test/engine/api/geary-folder-test.vala             |    2 +-
 53 files changed, 3652 insertions(+), 3584 deletions(-)
---
diff --cc src/client/application/geary-controller.vala
index 41f2d9a,6cd04ef..3fe7fdc
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@@ -2444,22 -2415,19 +2444,21 @@@ public class GearyController : Geary.Ba
              dialog.run();
          }
      }
 -    
 +
      private async void do_empty_folder_async(Geary.FolderSupport.Empty emptyable, Cancellable? cancellable)
          throws Error {
 -        yield emptyable.open_async(Geary.Folder.OpenFlags.NONE, cancellable);
 -        
 -        // be sure to close in all code paths
 +        bool open = false;
          try {
 +            yield emptyable.open_async(Geary.Folder.OpenFlags.NO_DELAY, cancellable);
 +            open = true;
-             yield emptyable.wait_for_open_async(cancellable);
              yield emptyable.empty_folder_async(cancellable);
          } finally {
 -            try {
 -                yield emptyable.close_async(null);
 -            } catch (Error err) {
 -                // ignored
 +            if (open) {
 +                try {
 +                    yield emptyable.close_async(null);
 +                } catch (Error err) {
 +                    // ignored
 +                }
              }
          }
      }
diff --cc src/engine/imap-engine/imap-engine-account-synchronizer.vala
index bec8eb6,c7ed995..18419f3
--- a/src/engine/imap-engine/imap-engine-account-synchronizer.vala
+++ b/src/engine/imap-engine/imap-engine-account-synchronizer.vala
@@@ -104,9 -104,9 +104,9 @@@ private class Geary.ImapEngine.RefreshF
          throws Error {
          bool opened = false;
          try {
 -            yield this.folder.open_async(Folder.OpenFlags.FAST_OPEN, cancellable);
 +            yield this.folder.open_async(Folder.OpenFlags.NONE, cancellable);
              opened = true;
-             yield this.folder.wait_for_open_async(cancellable);
+             yield this.folder.wait_for_remote_async(cancellable);
              yield sync_folder(cancellable);
          } finally {
              if (opened) {