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

Bug #255084 --> fix thunderbird crash when print previewing a message with blocked remote images. Thunderbird only.

Browse Source 
Get rid of a dead comment in nMsgMailNewsUrl::GetMsgWindow.


git-svn-id: svn://10.0.0.236/trunk@160645 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org
2004-08-11 00:24:30 +00:00
parent d780829a69
commit 5d37cefb31
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/mailnews/base/src/nsMsgContentPolicy.cpp
View File

@@ -272,8 +272,8 @@ nsMsgContentPolicy::ShouldLoad(PRUint32 aContentType,
// now we need to call out the msg sink informing it that this message has remote content
nsCOMPtr<nsIMsgWindow> msgWindow;
rv = mailnewsUrl->GetMsgWindow(getter_AddRefs(msgWindow));
NS_ENSURE_SUCCESS(rv, rv);
rv = mailnewsUrl->GetMsgWindow(getter_AddRefs(msgWindow)); // it's not an error for the msg window to be null
NS_ENSURE_TRUE(msgWindow, NS_ERROR_FAILURE);
nsCOMPtr<nsIMsgHeaderSink> msgHdrSink;
rv = msgWindow->GetMsgHeaderSink(getter_AddRefs(msgHdrSink));

18
mozilla/mailnews/base/util/nsMsgMailNewsUrl.cpp
View File

@@ -225,25 +225,15 @@ NS_IMETHODIMP nsMsgMailNewsUrl::SetStatusFeedback(nsIMsgStatusFeedback *aMsgFeed
NS_IMETHODIMP nsMsgMailNewsUrl::GetMsgWindow(nsIMsgWindow **aMsgWindow)
{
nsresult rv = NS_OK;
NS_ENSURE_ARG_POINTER(aMsgWindow);
// note: it is okay to return a null msg window and not return an error
// it's possible the url really doesn't have msg window
if (!m_msgWindow)
{
// nsCOMPtr<nsIMsgMailSession> mailSession =
// do_GetService(NS_MSGMAILSESSION_CONTRACTID, &rv);
// if(NS_SUCCEEDED(rv))
// mailSession->GetTemporaryMsgStatusFeedback(getter_AddRefs(m_statusFeedback));
}
if (aMsgWindow)
{
*aMsgWindow = m_msgWindow;
NS_IF_ADDREF(*aMsgWindow);
}
else
rv = NS_ERROR_NULL_POINTER;
return rv;
return NS_OK;
}
NS_IMETHODIMP nsMsgMailNewsUrl::SetMsgWindow(nsIMsgWindow *aMsgWindow)