[geary/wip/789924-network-transition-redux: 55/64] Ensure some timeout managers are reset as needed.



commit 17e8059918e45073f70ccc3e8565cb6a2b3d6ce2
Author: Michael James Gratton <mike vee net>
Date:   Wed Feb 21 16:46:07 2018 +1100

    Ensure some timeout managers are reset as needed.

 src/engine/imap-db/outbox/smtp-outbox-folder.vala  |    1 +
 .../imap-engine/imap-engine-minimal-folder.vala    |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/engine/imap-db/outbox/smtp-outbox-folder.vala 
b/src/engine/imap-db/outbox/smtp-outbox-folder.vala
index 70085b9..cf01573 100644
--- a/src/engine/imap-db/outbox/smtp-outbox-folder.vala
+++ b/src/engine/imap-db/outbox/smtp-outbox-folder.vala
@@ -887,6 +887,7 @@ private class Geary.SmtpOutboxFolder :
     }
 
     private void on_account_closed() {
+        this.start_timer.reset();
         this.stop_postman();
         this.smtp_endpoint.connectivity.notify["is-reachable"].disconnect(on_reachable_changed);
         this.smtp_endpoint.connectivity.address_error_reported.disconnect(on_connectivity_error);
diff --git a/src/engine/imap-engine/imap-engine-minimal-folder.vala 
b/src/engine/imap-engine/imap-engine-minimal-folder.vala
index 3180a72..1888dcb 100644
--- a/src/engine/imap-engine/imap-engine-minimal-folder.vala
+++ b/src/engine/imap-engine/imap-engine-minimal-folder.vala
@@ -771,14 +771,16 @@ private class Geary.ImapEngine.MinimalFolder : Geary.Folder, Geary.FolderSupport
     private async void close_internal_locked(Folder.CloseReason local_reason,
                                              Folder.CloseReason remote_reason,
                                              Cancellable? cancellable) {
+        debug("%s: Closing", this.to_string());
         // Ensure we don't attempt to start opening a remote while
         // closing
         this._account.session_pool.ready.disconnect(on_remote_ready);
         this.remote_open_timer.reset();
 
-        // Stop any internal tasks that are running
+        // Stop any internal tasks from running
         this.open_cancellable.cancel();
         this.email_prefetcher.close();
+        this.update_flags_timer.reset();
 
         // Once we get to this point, either there will be a remote
         // session open already, or none will ever get opened - no


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]