[geary/wip/cx-reestablish] Touch-up work; this is about done

[Jim Nelson <jnelson src gnome org>]

commit 7f1845436d10fb1dbeb4437fa17868a681a4947d
Author: Jim Nelson <jim yorba org>
Date:   Wed Jan 21 17:51:07 2015 -0800

    Touch-up work; this is about done

 .../imap-engine-account-synchronizer.vala          |    5 +++--
 .../imap-engine/imap-engine-minimal-folder.vala    |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/engine/imap-engine/imap-engine-account-synchronizer.vala 
b/src/engine/imap-engine/imap-engine-account-synchronizer.vala
index 3bcbaac..8e1c2bd 100644
--- a/src/engine/imap-engine/imap-engine-account-synchronizer.vala
+++ b/src/engine/imap-engine/imap-engine-account-synchronizer.vala
@@ -341,11 +341,12 @@ private class Geary.ImapEngine.AccountSynchronizer : Geary.BaseObject {
             return true;
         }
         
+        bool not_cancelled = true;
         try {
             yield sync_folder_async(folder, epoch, oldest_local, oldest_local_id);
         } catch (Error err) {
             if (err is IOError.CANCELLED)
-                return false;
+                not_cancelled = false;
             
             debug("Error background syncing folder %s: %s", folder.to_string(), err.message);
             
@@ -362,7 +363,7 @@ private class Geary.ImapEngine.AccountSynchronizer : Geary.BaseObject {
             debug("Error closing %s: %s", folder.to_string(), err.message);
         }
         
-        return true;
+        return not_cancelled;
     }
     
     private async void sync_folder_async(MinimalFolder folder, DateTime epoch, DateTime? oldest_local,
diff --git a/src/engine/imap-engine/imap-engine-minimal-folder.vala 
b/src/engine/imap-engine/imap-engine-minimal-folder.vala
index 5dc21f1..19a2e37 100644
--- a/src/engine/imap-engine/imap-engine-minimal-folder.vala
+++ b/src/engine/imap-engine/imap-engine-minimal-folder.vala
@@ -7,8 +7,8 @@
 private class Geary.ImapEngine.MinimalFolder : Geary.Folder, Geary.FolderSupport.Copy,
     Geary.FolderSupport.Mark, Geary.FolderSupport.Move {
     private const int FORCE_OPEN_REMOTE_TIMEOUT_SEC = 10;
-    private const int DEFAULT_REESTABLISH_DELAY_MSEC = 100;
-    private const int MAX_REESTABLISH_DELAY_MSEC = 30000;
+    private const int DEFAULT_REESTABLISH_DELAY_MSEC = 500;
+    private const int MAX_REESTABLISH_DELAY_MSEC = 60 * 1000;
     
     public override Account account { get { return _account; } }