зеркало из https://github.com/mozilla/gecko-dev.git
fix for #27799, rename folder failing for local mail (pop and "Local Folders")
r=mscott
This commit is contained in:
Родитель
438bd6ff77
Коммит
9340ea7ad1
|
@ -18,6 +18,12 @@
|
|||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* jefft@netscape.com
|
||||
* putterman@netscape.com
|
||||
* bienvenu@netscape.com
|
||||
* warren@netscape.com
|
||||
* alecf@netscape.com
|
||||
* sspitzer@netscape.com
|
||||
* Pierre Phaneuf <pp@ludusdesign.com>
|
||||
*/
|
||||
|
||||
|
@ -744,7 +750,7 @@ NS_IMETHODIMP nsMsgLocalMailFolder::Delete()
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsMsgLocalMailFolder::Rename(const char *newName)
|
||||
NS_IMETHODIMP nsMsgLocalMailFolder::Rename(const PRUnichar *aNewName)
|
||||
{
|
||||
nsCOMPtr<nsIFileSpec> oldPathSpec;
|
||||
nsCOMPtr<nsIFolder> parent;
|
||||
|
@ -774,21 +780,21 @@ NS_IMETHODIMP nsMsgLocalMailFolder::Rename(const char *newName)
|
|||
parentFolder->PropagateDelete(this, PR_FALSE);
|
||||
}
|
||||
|
||||
nsCAutoString newNameStr = newName;
|
||||
nsCAutoString newNameStr(aNewName);
|
||||
oldPathSpec->Rename(newNameStr.GetBuffer());
|
||||
newNameStr += ".msf";
|
||||
oldSummarySpec.Rename(newNameStr.GetBuffer());
|
||||
if (NS_SUCCEEDED(rv) && cnt > 0)
|
||||
{
|
||||
newNameStr = newName;
|
||||
newNameStr += ".sbd";
|
||||
dirSpec.Rename(newNameStr.GetBuffer());
|
||||
nsCAutoString newNameDirStr(aNewName);
|
||||
newNameDirStr += ".sbd";
|
||||
dirSpec.Rename(newNameDirStr.GetBuffer());
|
||||
}
|
||||
|
||||
if (parentSupport)
|
||||
{
|
||||
nsCOMPtr<nsIMsgFolder> newFolder;
|
||||
nsAutoString newFolderName = newName;
|
||||
nsAutoString newFolderName(aNewName);
|
||||
parentFolder->AddSubfolder(&newFolderName, getter_AddRefs(newFolder));
|
||||
nsCOMPtr<nsISupports> newFolderSupport = do_QueryInterface(newFolder);
|
||||
NotifyItemAdded(parentSupport, newFolderSupport, "folderView");
|
||||
|
|
|
@ -102,7 +102,7 @@ public:
|
|||
NS_IMETHOD Compact();
|
||||
NS_IMETHOD EmptyTrash();
|
||||
NS_IMETHOD Delete ();
|
||||
NS_IMETHOD Rename (const char *newName);
|
||||
NS_IMETHOD Rename (const PRUnichar *aNewName);
|
||||
NS_IMETHOD Adopt(nsIMsgFolder *srcFolder, PRUint32 *outPos);
|
||||
|
||||
NS_IMETHOD GetPrettyName(PRUnichar** prettyName); // Override of the base, for top-level mail folder
|
||||
|
|
Загрузка…
Ссылка в новой задаче