mirror
/
archivemail
mirror of https://git.code.sf.net/p/archivemail/code
1
0
Fork 0
Code Issues Releases Wiki Activity

IMAP: don't prepend NAMESPACE prefix to INBOX and its children

This commit is contained in:
Nikolaus Schulz 2010-10-16 18:53:28 +02:00
parent 45f82b7218
commit 77a2856e48
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
archivemail
View File

@ -1599,16 +1599,24 @@ def imap_guess_mailboxnames(srv, mailbox):
hdelim = imap_getdelim(srv)
vprint("IMAP namespace prefix: '%s', hierarchy delimiter: '%s'" % \
(nsprefix, hdelim))
if mailbox.startswith(nsprefix):
if mailbox.upper() == "INBOX" or \
(hdelim is not None and mailbox.upper().startswith("INBOX" + hdelim)):
# INBOX is not a real mailbox name, so namespace prefixes do not apply
# to INBOX and its children
boxnames = [mailbox]
elif mailbox.startswith(nsprefix):
boxnames = [mailbox]
else:
boxnames = [nsprefix + mailbox]
if os.path.sep in mailbox and hdelim is not None:
mailbox = mailbox.replace(os.path.sep, hdelim)
if mailbox.startswith(nsprefix):
if mailbox.upper().startswith("INBOX" + hdelim):
boxnames.append(mailbox)
if nsprefix:
boxnames.append(nsprefix + mailbox)
else:
if mailbox.startswith(nsprefix):
boxnames.append(mailbox)
if nsprefix:
boxnames.append(nsprefix + mailbox)
return boxnames