Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 206050 don't fire new mail notification for imap messages that are deleted or marked read by mail filters, sr=mscott

Browse Source
This commit is contained in:
bienvenu%nventure.com 2004-02-09 16:00:44 +00:00
parent e43c29e117
commit bdfa31a32a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mailnews/imap/src/nsImapMailFolder.cpp
View File

@ -3003,6 +3003,8 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, nsIMsgWindo
if (m_filterList && numActions)
(void)m_filterList->GetLoggingEnabled(&loggingEnabled);
PRBool msgIsNew = PR_TRUE;
for (PRUint32 actionIndex = 0; actionIndex < numActions && *applyMore; actionIndex++)
{
nsCOMPtr<nsIMsgRuleAction> filterAction;
@ -3051,6 +3053,7 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, nsIMsgWindo
StoreImapFlags(kImapMsgSeenFlag | kImapMsgDeletedFlag, PR_TRUE, keysToFlag.GetArray(), keysToFlag.GetSize());
m_msgMovedByFilter = PR_TRUE; // this will prevent us from adding the header to the db.
}
msgIsNew = PR_FALSE;
}
// note that delete falls through to move.
case nsMsgFilterAction::MoveToFolder:
@ -3082,6 +3085,7 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, nsIMsgWindo
nsMsgKeyArray keysToFlag;
keysToFlag.Add(msgKey);
StoreImapFlags(kImapMsgSeenFlag, PR_TRUE, keysToFlag.GetArray(), keysToFlag.GetSize());
msgIsNew = PR_FALSE;
}
break;
case nsMsgFilterAction::MarkFlagged:
@ -3127,6 +3131,12 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, nsIMsgWindo
}
}
}
if (!msgIsNew)
{
PRInt32 numNewMessages;
GetNumNewMessages(PR_FALSE, &numNewMessages);
SetNumNewMessages(numNewMessages - 1);
}
return NS_OK;
}