]> git.madduck.net Git - etc/offlineimap.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

migrate to offlineimap 6.5
authormartin f. krafft <madduck@madduck.net>
Sun, 13 May 2012 10:00:05 +0000 (12:00 +0200)
committermartin f. krafft <madduck@madduck.net>
Sun, 13 May 2012 10:00:05 +0000 (12:00 +0200)
.offlineimap/helper.py

index fe93e0b9bf195ece575fe54eafdb9e24422704fa..674adf351c382da47a06094b05d43ae57d4dd417 100644 (file)
@@ -2,21 +2,21 @@
 
 import re
 
 
 import re
 
-base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent', 'Queue', 'sent']
+base_excludes = ['delayed', 'outgoing', 'Trash', 'Sent', 'Queue', 'sent', 'inbox']
 full_excludes_re = ['discard', 'spool', 'spam', 'store\..+']
 full_excludes_re = ['discard', 'spool', 'spam', 'store\..+']
-prioritised = ['outgoing','resubmit','drafts','inbox','ardex','immo','debian','sudetia','admin','retrain']
+prioritised = ['outgoing','resubmit','drafts','INBOX','ardex','immo','debian','sudetia','admin','retrain']
 deprioritised = ['discard','spam','store','spool']
 
 def py_foldersort_main(x, y):
     for prefix in prioritised:
 deprioritised = ['discard','spam','store','spool']
 
 def py_foldersort_main(x, y):
     for prefix in prioritised:
-        if x.startswith(prefix):
+        if x.name.startswith(prefix):
             return -1
             return -1
-        elif y.startswith(prefix):
+        elif y.name.startswith(prefix):
             return +1
     for prefix in deprioritised:
             return +1
     for prefix in deprioritised:
-        if x.startswith(prefix):
+        if x.name.startswith(prefix):
             return +1
             return +1
-        elif y.startswith(prefix):
+        elif y.name.startswith(prefix):
             return -1
     return cmp(x, y)
 
             return -1
     return cmp(x, y)