fix disappearing imap namespaces when you have an online server directory set by not listing namespaces, 239868 sr=mscott, a=asa
git-svn-id: svn://10.0.0.236/trunk@154687 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -1791,6 +1791,10 @@ NS_IMETHODIMP nsImapIncomingServer::DiscoveryDone()
|
||||
((NS_SUCCEEDED(currentFolder->GetHasSubFolders(&hasSubFolders)) && hasSubFolders)
|
||||
&& !NoDescendentsAreVerified(currentFolder)))
|
||||
{
|
||||
PRBool isNamespace;
|
||||
currentImapFolder->GetIsNamespace(&isNamespace);
|
||||
if (!isNamespace) // don't list namespaces explicitly
|
||||
{
|
||||
// If there are no subfolders and this is unverified, we don't want to run
|
||||
// this url. That is, we want to undiscover the folder.
|
||||
// If there are subfolders and no descendants are verified, we want to
|
||||
@@ -1800,6 +1804,7 @@ NS_IMETHODIMP nsImapIncomingServer::DiscoveryDone()
|
||||
currentImapFolder->SetExplicitlyVerify(PR_FALSE);
|
||||
currentImapFolder->List();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
DeleteNonVerifiedFolders(currentFolder);
|
||||
|
||||
Reference in New Issue
Block a user