[geary/wip/789924-network-transition-redux: 10/10] Trivial clean up of MinimalFolder's private attrs.



commit ed58e038a95ff23f6ee7249f42e9010664919163
Author: Michael James Gratton <mike vee net>
Date:   Fri Jan 26 13:50:19 2018 +1030

    Trivial clean up of MinimalFolder's private attrs.

 .../imap-engine/imap-engine-minimal-folder.vala    |   25 ++++++++++++-------
 1 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/src/engine/imap-engine/imap-engine-minimal-folder.vala 
b/src/engine/imap-engine/imap-engine-minimal-folder.vala
index 6795c94..5101ce9 100644
--- a/src/engine/imap-engine/imap-engine-minimal-folder.vala
+++ b/src/engine/imap-engine/imap-engine-minimal-folder.vala
@@ -52,11 +52,16 @@ private class Geary.ImapEngine.MinimalFolder : Geary.Folder, Geary.FolderSupport
             return _special_folder_type;
         }
     }
-    
-    private ProgressMonitor _opening_monitor = new 
Geary.ReentrantProgressMonitor(Geary.ProgressType.ACTIVITY);
-    public override Geary.ProgressMonitor opening_monitor { get { return _opening_monitor; } }
 
-    internal ImapDB.Folder local_folder  { get; protected set; }
+    private ProgressMonitor _opening_monitor =
+        new Geary.ReentrantProgressMonitor(Geary.ProgressType.ACTIVITY);
+    public override Geary.ProgressMonitor opening_monitor {
+        get {
+            return _opening_monitor;
+        }
+    }
+
+    internal ImapDB.Folder local_folder  { get; private set; }
     internal int remote_count { get; private set; default = -1; }
 
     internal ReplayQueue replay_queue { get; private set; }
@@ -68,17 +73,19 @@ private class Geary.ImapEngine.MinimalFolder : Geary.Folder, Geary.FolderSupport
 
     private Folder.OpenFlags open_flags = OpenFlags.NONE;
     private int open_count = 0;
+    private Cancellable? open_cancellable = null;
+    private Nonblocking.Mutex open_mutex = new Nonblocking.Mutex();
+    private Nonblocking.Mutex close_mutex = new Nonblocking.Mutex();
+    private Nonblocking.Semaphore closed_semaphore = new Nonblocking.Semaphore();
 
-    private TimeoutManager remote_open_timer;
     private Imap.FolderSession? remote_session = null;
     private Nonblocking.ReportingSemaphore<bool> remote_wait_semaphore =
         new Nonblocking.ReportingSemaphore<bool>(false);
-    private Nonblocking.Semaphore closed_semaphore = new Nonblocking.Semaphore();
-    private Nonblocking.Mutex open_mutex = new Nonblocking.Mutex();
-    private Nonblocking.Mutex close_mutex = new Nonblocking.Mutex();
+    private TimeoutManager remote_open_timer;
+
     private TimeoutManager update_flags_timer;
+
     private TimeoutManager refresh_unseen_timer;
-    private Cancellable? open_cancellable = null;
 
 
     /**


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