Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug 136476 -MDN:If you filter mesgs and receive a mesg that is requesting RR, you are prompted to send the RR before you actually click on the mesg; r=bienvenu, sr=sspitzer

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@119071 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jefft%netscape.com
2002-04-16 04:13:09 +00:00
parent e3d1f58b1c
commit b565343992
2 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mozilla/mailnews/imap/src/nsImapMailFolder.cpp
View File

@@ -2849,42 +2849,6 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, nsIMsgWindo
msgHdr->SetFlags(msgFlags & ~MSG_FLAG_MDN_REPORT_NEEDED);
msgHdr->OrFlags(MSG_FLAG_MDN_REPORT_SENT, &newFlags);
nsCOMPtr<nsIMsgMdnGenerator> mdnGenerator;
nsCOMPtr<nsIMimeHeaders> mimeHeaders;
mdnGenerator =
do_CreateInstance(NS_MSGMDNGENERATOR_CONTRACTID, &rv);
if (mdnGenerator)
{
mimeHeaders = do_CreateInstance(NS_IMIMEHEADERS_CONTRACTID,
&rv);
if (NS_SUCCEEDED(rv))
{
char *headers;
PRInt32 headersSize;
rv = m_msgParser->GetAllHeaders(&headers,
&headersSize);
if (NS_SUCCEEDED(rv))
{
mimeHeaders->Initialize(headers, headersSize);
nsMsgKey msgKey;
msgHdr->GetMessageKey(&msgKey);
if (actionType == nsMsgFilterAction::Delete)
{
mdnGenerator->Process(nsIMsgMdnGenerator::eDeleted,
msgWindow, this, msgKey,
mimeHeaders, PR_TRUE);
}
else
{
mdnGenerator->Process(nsIMsgMdnGenerator::eProcessed,
msgWindow, this, msgKey,
mimeHeaders, PR_TRUE);
}
}
}
}
}
nsresult err = MoveIncorporatedMessage(msgHdr, mDatabase, actionTargetFolderUri, filter, msgWindow);
if (NS_SUCCEEDED(err))
@@ -3495,12 +3459,6 @@ void nsImapMailFolder::TweakHeaderFlags(nsIImapProtocol* aProtocol, nsIMsgDBHdr
tweakMe->AndFlags(~MSG_FLAG_MDN_REPORT_NEEDED, &dbHdrFlags);
}
}
else
{
if (!(imap_flags & kImapMsgRecentFlag) &&
dbHdrFlags & MSG_FLAG_MDN_REPORT_NEEDED)
tweakMe->AndFlags(~MSG_FLAG_MDN_REPORT_NEEDED, &dbHdrFlags);
}
if (imap_flags & kImapMsgAnsweredFlag)
newFlags |= MSG_FLAG_REPLIED;

2
mozilla/mailnews/imap/src/nsImapServerResponseParser.cpp
View File

@@ -1686,7 +1686,7 @@ void nsImapServerResponseParser::resp_text_code()
{
fSettablePermanentFlags |= kImapMsgDraftFlag;
}
else if (!PL_strncasecmp(fNextToken, "\\*)]", 4))
else if (!PL_strncasecmp(fNextToken, "\\*", 2))
{
fSupportsUserDefinedFlags |= kImapMsgSupportUserFlag;
fSupportsUserDefinedFlags |= kImapMsgSupportForwardedFlag;