Merge branch 'master' of http://git.complete.org/offlineimap

diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py
index f0f19e4c8712baa2bbdbafac547844997d30c9e0..a4933960d817dbad4c813130af78c9ba874f1952 100644 (file)
--- a/offlineimap/accounts.py
+++ b/offlineimap/accounts.py
@@ -241,6 +241,7 @@ class AccountSynchronizationMixin:
                 threadutil.threadsreset(folderthreads)
                 if siglistener.clearfolders():
                     break
+            mbnames.sort(self.name, remoterepos.foldersort)
             mbnames.write()
             localrepos.forgetfolders()
             remoterepos.forgetfolders()

diff --git a/offlineimap/mbnames.py b/offlineimap/mbnames.py
index 5ff0f29256bcf8696d2956dc411e92e2524e7905..08591c7b4945977013b250f88fcc1fde7f59cdff 100644 (file)
--- a/offlineimap/mbnames.py
+++ b/offlineimap/mbnames.py
@@ -36,6 +36,9 @@ def add(accountname, foldername):
     if not foldername in boxes[accountname]:
         boxes[accountname].append(foldername)
 
+def sort(accountname, foldersort):
+    boxes[accountname].sort(foldersort)
+
 def write():
     # See if we're ready to write it out.
     for account in accounts: