fix setting of mru time for folders when msgs copied into them, and bad operator precedence for listing acl for non-namespaces, sr=mscott
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@190991 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -6768,7 +6768,7 @@ nsImapMailFolder::CopyMessages(nsIMsgFolder* srcFolder,
|
||||
nsCOMPtr<nsISupports> srcSupport;
|
||||
nsCOMPtr<nsISupports> copySupport;
|
||||
|
||||
if (!(mFlags & MSG_FOLDER_FLAG_TRASH|MSG_FOLDER_FLAG_JUNK))
|
||||
if (!(mFlags & (MSG_FOLDER_FLAG_TRASH|MSG_FOLDER_FLAG_JUNK)))
|
||||
SetMRUTime();
|
||||
|
||||
if (WeAreOffline())
|
||||
@@ -7619,7 +7619,7 @@ NS_IMETHODIMP nsImapMailFolder::GetFolderNeedsACLListed(PRBool *bVal)
|
||||
PRBool dontNeedACLListed = !m_folderNeedsACLListed;
|
||||
// if we haven't acl listed, and it's not a no select folder or the inbox,
|
||||
// then we'll list the acl if it's not a namespace.
|
||||
if (m_folderNeedsACLListed && !(mFlags & MSG_FOLDER_FLAG_IMAP_NOSELECT | MSG_FOLDER_FLAG_INBOX))
|
||||
if (m_folderNeedsACLListed && !(mFlags & (MSG_FOLDER_FLAG_IMAP_NOSELECT | MSG_FOLDER_FLAG_INBOX)))
|
||||
GetIsNamespace(&dontNeedACLListed);
|
||||
|
||||
*bVal = !dontNeedACLListed;
|
||||
|
||||
Reference in New Issue
Block a user