tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Sebastian Spaeth 2012-01-07 22:04:25 +01:00
commit 6c1d80f727
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.draft.rst
View File

@ -16,6 +16,8 @@ New Features
Changes Changes
------- -------
* Add folderfilter information to the --info output
Bug Fixes Bug Fixes
--------- ---------

14
offlineimap/ui/UIBase.py
View File

@ -386,12 +386,16 @@ class UIBase(object):
self._msg("nametrans= %s\n" % nametrans) self._msg("nametrans= %s\n" % nametrans)
folders = repository.getfolders() folders = repository.getfolders()
foldernames = [(f.name, f.getvisiblename()) for f in folders] foldernames = [(f.name, f.getvisiblename(), f.sync_this) \
for f in folders]
folders = [] folders = []
for name, visiblename in foldernames: for name, visiblename, sync_this in foldernames:
if name == visiblename: folders.append(name) syncstr = "" if sync_this else " (disabled)"
else: folders.append("%s -> %s" % (name, visiblename)) if name == visiblename: folders.append("%s%s" % (name,
self._msg("Folderlist: %s\n" % str(folders)) syncstr))
else: folders.append("%s -> %s%s" % (name,
visiblename, syncstr))
self._msg("Folderlist:\n %s\n" % "\n ".join(folders))
finally: finally:
if conn: #release any existing IMAP connection if conn: #release any existing IMAP connection
repository.imapserver.close() repository.imapserver.close()