Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 06:35:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug 12928 - Delete imap folder makes Trash disappear from the folder view

Browse Source
This commit is contained in:
jefft%netscape.com 1999-09-01 20:06:25 +00:00
parent 38ba384b59
commit b37dfd2d1c
2 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1409,17 +1409,14 @@ NS_IMETHODIMP nsImapMailFolder::OnlineFolderRename(
nsCOMPtr<nsIFolder> iFolder;
nsCOMPtr<nsIMsgImapMailFolder> parent;
nsCOMPtr<nsIMsgFolder> me;
rv = GetParent(getter_AddRefs(iFolder));
rv = GetFolder(aStruct->fOldName, getter_AddRefs(me));
if (NS_FAILED(rv)) return rv;
rv = me->GetParent(getter_AddRefs(iFolder));
if (NS_SUCCEEDED(rv))
{
parent = do_QueryInterface(iFolder, &rv);
if (NS_SUCCEEDED(rv))
{
rv = QueryInterface(nsCOMTypeInfo<nsIMsgFolder>::GetIID(),
getter_AddRefs(me));
if (NS_SUCCEEDED(rv))
parent->RemoveSubFolder(me);
}
}
nsCOMPtr<nsIMsgFolder> rootFolder;
rv = GetRootFolder(getter_AddRefs(rootFolder));
@ -2506,6 +2503,43 @@ PRBool nsImapMailFolder::DeleteIsMoveToTrash()
return rv;
}
nsresult nsImapMailFolder::GetFolder(const char* name, nsIMsgFolder** pFolder)
{
nsresult rv = NS_ERROR_NULL_POINTER;
if (!name || !*name || !pFolder) return rv;
*pFolder = nsnull;
nsCOMPtr<nsIMsgFolder> rootFolder;
rv = GetRootFolder(getter_AddRefs(rootFolder));
if (NS_SUCCEEDED(rv) && rootFolder)
{
char* uri = nsnull;
rv = rootFolder->GetURI(&uri);
if (NS_SUCCEEDED(rv) && uri)
{
nsAutoString uriAutoString = uri;
uriAutoString.Append('/');
uriAutoString.Append(name);
NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
char* uriString = uriAutoString.ToNewCString();
nsCOMPtr<nsIRDFResource> res;
rv = rdf->GetResource(uriString, getter_AddRefs(res));
if (NS_SUCCEEDED(rv))
{
nsCOMPtr<nsIMsgFolder> folder(do_QueryInterface(res, &rv));
if (NS_SUCCEEDED(rv) && folder)
{
*pFolder = folder;
NS_ADDREF(*pFolder);
}
}
delete [] uriString;
}
PR_FREEIF(uri);
}
return rv;
}
nsresult nsImapMailFolder::GetTrashFolder(nsIMsgFolder **pTrashFolder)
{
if (!pTrashFolder)

1
mailnews/imap/src/nsImapMailFolder.h
View File

@ -328,6 +328,7 @@ protected:
virtual PRBool ShowDeletedMessages();
virtual PRBool DeleteIsMoveToTrash();
void ParseUidString(char *uidString, nsMsgKeyArray &keys);
nsresult GetFolder(const char *name, nsIMsgFolder **pFolder);
nsresult GetTrashFolder(nsIMsgFolder **pTrashFolder);
PRBool InTrash(nsIMsgFolder* folder);