зеркало из https://github.com/mozilla/pjs.git
fix for bug #195234
mail status line reports: "Transferring data" with the wrong hostname. affects pop, imap, and nntp. (not smtp) thanks to ch.ey@gmx.net for the initial patch. r/sr=bienvenu, a=sspitzer
This commit is contained in:
Родитель
e07436f886
Коммит
e2d8a16345
|
@ -680,8 +680,23 @@ nsMsgProtocol::OnTransportStatus(nsITransport *transport, nsresult status,
|
|||
{
|
||||
nsCAutoString host;
|
||||
if (m_url)
|
||||
{
|
||||
m_url->GetHost(host);
|
||||
mProgressEventSink->OnStatus(this, nsnull, status, NS_ConvertUTF8toUCS2(host).get());
|
||||
nsCOMPtr<nsIMsgMailNewsUrl> mailnewsUrl = do_QueryInterface(m_url);
|
||||
if (mailnewsUrl)
|
||||
{
|
||||
nsCOMPtr<nsIMsgIncomingServer> server;
|
||||
nsresult rv = mailnewsUrl->GetServer(getter_AddRefs(server));
|
||||
if (NS_SUCCEEDED(rv) && server)
|
||||
{
|
||||
nsXPIDLCString realHostName;
|
||||
rv = server->GetRealHostName(getter_Copies(realHostName));
|
||||
if (NS_SUCCEEDED(rv))
|
||||
host = realHostName;
|
||||
}
|
||||
}
|
||||
mProgressEventSink->OnStatus(this, nsnull, status, NS_ConvertUTF8toUCS2(host).get());
|
||||
}
|
||||
}
|
||||
}
|
||||
return NS_OK;
|
||||
|
|
|
@ -8261,8 +8261,23 @@ nsImapMockChannel::OnTransportStatus(nsITransport *transport, nsresult status,
|
|||
{
|
||||
nsCAutoString host;
|
||||
if (m_url)
|
||||
{
|
||||
m_url->GetHost(host);
|
||||
mProgressEventSink->OnStatus(this, nsnull, status, NS_ConvertUTF8toUCS2(host).get());
|
||||
nsCOMPtr<nsIMsgMailNewsUrl> mailnewsUrl = do_QueryInterface(m_url);
|
||||
if (mailnewsUrl)
|
||||
{
|
||||
nsCOMPtr<nsIMsgIncomingServer> server;
|
||||
nsresult rv = mailnewsUrl->GetServer(getter_AddRefs(server));
|
||||
if (NS_SUCCEEDED(rv) && server)
|
||||
{
|
||||
nsXPIDLCString realHostName;
|
||||
rv = server->GetRealHostName(getter_Copies(realHostName));
|
||||
if (NS_SUCCEEDED(rv))
|
||||
host = realHostName;
|
||||
}
|
||||
}
|
||||
mProgressEventSink->OnStatus(this, nsnull, status, NS_ConvertUTF8toUCS2(host).get());
|
||||
}
|
||||
}
|
||||
}
|
||||
return NS_OK;
|
||||
|
|
Загрузка…
Ссылка в новой задаче