From: martin f. krafft <madduck@madduck.net>
Date: Sun, 1 Mar 2009 17:37:38 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/offlineimap
X-Git-Url: https://git.madduck.net/etc/offlineimap.git/commitdiff_plain/d9501643faeb73ab6a7811fe4c87d4de34e1e8c4?hp=a38ce0d9977fa627ebe0eff27cbd0a26982acea4

Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/offlineimap

Conflicts:
	.offlineimap/helper.py
---

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index b6c5c07..056eb5d 100644
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -58,5 +58,5 @@ def py_folderfilter_seamus(x):
     return True
 
 def py_folderfilter_mbnames(acct, x):
-    if acct == 'logcheck': return False
-    return not re.search('^(store(/.+)?|retrain/(ham|spam)|spool|discard|spam)', x)
+    return acct in ['seamus.madduck.net'] \
+            and not re.search('^(store(/.+)?|retrain/(ham|spam)|spool|discard|spam)', x)