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

Changes to unify nsINetPrompt with nsIPrompt, making single sign-on work. Single sign-on API changes. Fixes bugs 34583, 34720, 34725, 24746, 33094. r=sspitzer,morse

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@69998 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
warren%netscape.com
2000-05-16 05:35:23 +00:00
parent db806b4238
commit 1958638f6c
54 changed files with 971 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/docshell/base/nsWebShell.cpp
View File

@@ -1046,7 +1046,7 @@ nsWebShell::OnOverLink(nsIContent* aContent,
NS_IMETHODIMP
nsWebShell::GetLinkState(const nsString& aLinkURI, nsLinkState& aState)
{
aState = eLinkState_Unvisited;
aState = eLinkState_Unvisited;
if(mGlobalHistory)
{
@@ -1276,7 +1276,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
errorMsg.AppendWithConversion(' ');
errorMsg.Append(messageStr);
prompter->Alert(errorMsg.GetUnicode());
prompter->Alert(nsnull, errorMsg.GetUnicode());
}
else if(aStatus == NS_ERROR_CONNECTION_REFUSED)
{// Doc failed to load because we couldn't connect to the server.
@@ -1304,7 +1304,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
errorMsg.AppendInt(port);
}
errorMsg.AppendWithConversion('.');
prompter->Alert(errorMsg.GetUnicode());
prompter->Alert(nsnull, errorMsg.GetUnicode());
}
else if(aStatus == NS_ERROR_NET_TIMEOUT)
{// Doc failed to load because the socket function timed out.
@@ -1326,7 +1326,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
errorMsg.AppendWithConversion(host);
errorMsg.AppendWithConversion('.');
prompter->Alert(errorMsg.GetUnicode());
prompter->Alert(nsnull, errorMsg.GetUnicode());
} // end NS_ERROR_NET_TIMEOUT
} // end mDocLoader == loader