corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug #82601. "mozilla will continue trying to create http auth dialogs until the cows come home." Make sure to detect errors creating new windows and pass those errors along to callers. r=ccarlen, sr=tor, a=asa

Browse Source
This commit is contained in:
blizzard@redhat.com
2001-05-25 20:25:49 +00:00
parent 30632e5715
commit bd77a98462
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
embedding/components/windowwatcher/src/nsPromptService.cpp
View File

@@ -156,6 +156,8 @@ nsPromptService::AlertCheck(nsIDOMWindow *parent,
block->SetInt(eCheckboxState, *checkValue);
rv = DoDialog(parent, block, kPromptURL);
if (NS_FAILED(rv))
return rv;
block->GetInt(eCheckboxState, checkValue);
@@ -191,6 +193,8 @@ nsPromptService::Confirm(nsIDOMWindow *parent,
block->SetString(eIconClass, styleClass.get());
rv = DoDialog(parent, block, kPromptURL);
if (NS_FAILED(rv))
return rv;
PRInt32 buttonPressed = 0;
block->GetInt(eButtonPressed, &buttonPressed);
@@ -230,6 +234,9 @@ nsPromptService::ConfirmCheck(nsIDOMWindow *parent,
block->SetInt(eCheckboxState, *checkValue);
rv = DoDialog(parent, block, kPromptURL);
if (NS_FAILED(rv))
return rv;
PRInt32 tempInt = 0;
block->GetInt(eButtonPressed, &tempInt);
*_retval = tempInt ? PR_FALSE : PR_TRUE;
@@ -318,6 +325,8 @@ nsPromptService::ConfirmEx(nsIDOMWindow *parent,
/* perform the dialog */
rv = DoDialog(parent, block, kPromptURL);
if (NS_FAILED(rv))
return rv;
/* get back output parameters */
@@ -369,6 +378,8 @@ nsPromptService::Prompt(nsIDOMWindow *parent,
}
rv = DoDialog(parent, block, kPromptURL);
if (NS_FAILED(rv))
return rv;
PRInt32 tempInt = 0;
block->GetInt(eButtonPressed, &tempInt);
@@ -433,6 +444,8 @@ nsPromptService::PromptUsernameAndPassword(nsIDOMWindow *parent,
}
rv = DoDialog(parent, block, kPromptURL);
if (NS_FAILED(rv))
return rv;
PRInt32 tempInt = 0;
block->GetInt(eButtonPressed, &tempInt);
@@ -501,6 +514,8 @@ NS_IMETHODIMP nsPromptService::PromptPassword(nsIDOMWindow *parent,
}
rv = DoDialog(parent, block, kPromptURL);
if (NS_FAILED(rv))
return rv;
PRInt32 tempInt = 0;
block->GetInt(eButtonPressed, &tempInt);
@@ -556,6 +571,8 @@ nsPromptService::Select(nsIDOMWindow *parent, const PRUnichar *dialogTitle,
*outSelection = -1;
rv = DoDialog(parent, block, kSelectPromptURL);
if (NS_FAILED(rv))
return rv;
PRInt32 buttonPressed = 0;
block->GetInt(eButtonPressed, &buttonPressed);
@@ -587,9 +604,9 @@ nsPromptService::DoDialog(nsIDOMWindow *aParent,
nsCOMPtr<nsISupports> arguments(do_QueryInterface(aParamBlock));
nsCOMPtr<nsIDOMWindow> dialog;
mWatcher->OpenWindow(aParent, aChromeURL, "_blank",
"centerscreen,chrome,modal,titlebar", arguments,
getter_AddRefs(dialog));
rv = mWatcher->OpenWindow(aParent, aChromeURL, "_blank",
"centerscreen,chrome,modal,titlebar", arguments,
getter_AddRefs(dialog));
return rv;
}