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

fixed bug 23447, 36429, 32797 -- mail folder not getting set correctly when UpdateSummaryTotal this causes subsequent empty trash & delete message to fail

Browse Source
This commit is contained in:
jefft%netscape.com 2000-05-03 22:40:46 +00:00
parent 67a2dbc173
commit 0964d5ed58
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mailnews/base/util/nsMsgDBFolder.cpp
View File

@ -387,9 +387,11 @@ nsresult nsMsgDBFolder::ReadDBFolderInfo(PRBool force)
mIsCachable = PR_TRUE;
if (folderInfo)
{
folderInfo->GetFlags((PRInt32 *)&mFlags);
mInitializedFromCache = PR_TRUE;
if (!mInitializedFromCache)
{
folderInfo->GetFlags((PRInt32 *)&mFlags);
mInitializedFromCache = PR_TRUE;
}
folderInfo->GetNumMessages(&mNumTotalMessages);
folderInfo->GetNumNewMessages(&mNumUnreadMessages);

20
mailnews/local/src/nsLocalMailFolder.cpp
View File

@ -174,8 +174,10 @@ nsFolderCompactState::FinishCompact()
nsCOMPtr<nsIMsgFolder> parentFolder;
nsCOMPtr<nsIDBFolderInfo> folderInfo;
nsFileSpec fileSpec;
PRUint32 flags;
// get leaf name and database name of the folder
m_folder->GetFlags(&flags);
rv = m_folder->GetPath(getter_AddRefs(pathSpec));
pathSpec->GetFileSpec(&fileSpec);
@ -223,6 +225,7 @@ nsFolderCompactState::FinishCompact()
rv = parentFolder->AddSubfolder(&folderName, getter_AddRefs(child));
if (child)
{
child->SetFlags(flags);
nsCOMPtr<nsISupports> childSupports = do_QueryInterface(child);
nsCOMPtr<nsISupports> parentSupports = do_QueryInterface(parentFolder);
if (childSupports && parentSupports)
@ -1073,6 +1076,10 @@ NS_IMETHODIMP nsMsgLocalMailFolder::EmptyTrash(nsIMsgWindow *msgWindow)
rv = GetTrashFolder(getter_AddRefs(trashFolder));
if (NS_SUCCEEDED(rv))
{
PRUint32 flags;
nsXPIDLCString trashUri;
trashFolder->GetURI(getter_Copies(trashUri));
trashFolder->GetFlags(&flags);
trashFolder->RecursiveSetDeleteIsMoveToTrash(PR_FALSE);
nsCOMPtr<nsIFolder> parent;
rv = trashFolder->GetParent(getter_AddRefs(parent));
@ -1093,6 +1100,19 @@ NS_IMETHODIMP nsMsgLocalMailFolder::EmptyTrash(nsIMsgWindow *msgWindow)
if (trashSupport && parentSupport)
NotifyItemDeleted(parentSupport, trashSupport, "folderView");
parentFolder->CreateSubfolder(folderName.GetUnicode());
NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID,
&rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIRDFResource> res;
rv = rdfService->GetResource(trashUri,
getter_AddRefs(res));
if (NS_SUCCEEDED(rv))
{
nsCOMPtr<nsIMsgFolder> newfolder =
do_QueryInterface(res);
if (newfolder)
newfolder->SetFlags(flags);
}
}
}
}