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

[sspitzer checking in as varada]

Browse Source 
fix for smoketest blocker #110478.  reply to local messages fails to quote the message.
calling SetSpec() on a spec with a query string causes problems.  see #110508
but to fix the blocker, I've rewritten the code to use SetQuery(), which is better anyways.

r=ducarroz


git-svn-id: svn://10.0.0.236/trunk@108324 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
varada%netscape.com
2001-11-16 20:51:54 +00:00
parent eaa7acdb9f
commit 95110e8725
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/mailnews/compose/src/nsMsgQuote.cpp
View File

@@ -194,25 +194,22 @@ nsMsgQuote::QuoteMessage(const char *msgURI, PRBool quoteHeaders, nsIStreamListe
rv = msgService->GetUrlForUri(msgURI, getter_AddRefs(aURL), nsnull);
if (NS_FAILED(rv)) return rv;
// now we want to append some quote specific information to the
// end of the url spec.
nsXPIDLCString urlSpec;
aURL->GetSpec(getter_Copies(urlSpec));
nsCAutoString modifiedUrlSpec(urlSpec);
PRBool bAutoQuote = PR_TRUE;
nsCOMPtr<nsIPref> prefs(do_GetService(kPrefCID, &rv));
if (NS_SUCCEEDED(rv))
prefs->GetBoolPref("mail.auto_quote", &bAutoQuote);
if (! bAutoQuote) /* We don't need to quote the message body but we still need to extract the headers */
modifiedUrlSpec += "?header=only";
else if (quoteHeaders)
modifiedUrlSpec += "?header=quote";
else
modifiedUrlSpec += "?header=quotebody";
nsCOMPtr <nsIMsgMailNewsUrl> mailNewsUrl = do_QueryInterface(aURL, &rv);
NS_ENSURE_SUCCESS(rv,rv);
aURL->SetSpec(modifiedUrlSpec.get());
if (! bAutoQuote) /* We don't need to quote the message body but we still need to extract the headers */
rv = mailNewsUrl->SetQuery("header=only");
else if (quoteHeaders)
rv = mailNewsUrl->SetQuery("header=quote");
else
rv = mailNewsUrl->SetQuery("header=quotebody");
NS_ENSURE_SUCCESS(rv,rv);
// if we were given a non empty charset, then use it
if (aMsgCharSet && *aMsgCharSet)