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

170555 r=mscott sr=bienvenu Changed IsValidFolderURI to GetExistingFolder so that it can be reused

Browse Source
This commit is contained in:
naving%netscape.com 2002-10-04 22:32:04 +00:00
parent de5e57b1ab
commit 7dda838fe9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mailnews/compose/src/nsMsgSend.cpp
View File

@ -2774,10 +2774,15 @@ nsMsgComposeAndSend::InitCompositionFields(nsMsgCompFields *fields)
useDefaultFCC = PR_FALSE;
mCompFields->SetFcc("");
}
else if (IsValidFolderURI(fieldsFCC))
else
{
useDefaultFCC = PR_FALSE;
SetMimeHeader(nsMsgCompFields::MSG_FCC_HEADER_ID, fieldsFCC);
nsCOMPtr<nsIMsgFolder> folder;
(void)GetExistingFolder(fieldsFCC, getter_AddRefs(folder));
if (folder)
{
useDefaultFCC = PR_FALSE;
SetMimeHeader(nsMsgCompFields::MSG_FCC_HEADER_ID, fieldsFCC);
}
}
}
@ -4070,6 +4075,7 @@ nsMsgComposeAndSend::MimeDoFCC(nsFileSpec *input_file,
PRUnichar *printfString = nsnull;
nsXPIDLString folderName;
nsXPIDLString msg;
nsCOMPtr<nsIMsgFolder> folder;
// Before continuing, just check the user has not cancel the operation
if (mSendProgress)
@ -4160,7 +4166,9 @@ nsMsgComposeAndSend::MimeDoFCC(nsFileSpec *input_file,
// First, we we need to put a Berkeley "From - " delimiter at the head of
// the file for parsing...
//
if ((mode == nsMsgDeliverNow || mode == nsMsgSendUnsent) && IsValidFolderURI(fcc_header))
(void)GetExistingFolder(fcc_header, getter_AddRefs(folder));
if ((mode == nsMsgDeliverNow || mode == nsMsgSendUnsent) && folder)
turi = PL_strdup(fcc_header);
else
turi = GetFolderURIFromUserPrefs(mode, mUserIdentity);