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

4530 Password entry locks Apprunner.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@31113 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
davidm%netscape.com
1999-05-11 19:42:14 +00:00
parent 8670251a20
commit cca629a582
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/xpfe/appshell/src/nsAppShellService.cpp
View File

@@ -342,9 +342,7 @@ nsAppShellService::RunModalDialog(
{
nsresult rv;
nsIWebShellWindow *window;
window = nsnull;
#ifdef XP_PC // XXX: Won't work with any other platforms yet.
// First push a nested event queue for event processing from netlib
@@ -358,7 +356,7 @@ nsAppShellService::RunModalDialog(
eQueueService->PushThreadEventQueue();
#endif
rv = CreateDialogWindow(aParent, aUrl, PR_TRUE, window, anObserver, nsnull,
rv = CreateDialogWindow(aParent, aUrl, PR_TRUE, aResult, anObserver, aCallbacks,
aInitialWidth, aInitialHeight);
if (NS_SUCCEEDED(rv)) {
@@ -369,7 +367,7 @@ nsAppShellService::RunModalDialog(
// Windows OS wants the parent disabled for modality
if (NS_SUCCEEDED(gotParent))
parentWindowWidgetThing->Enable(PR_FALSE);
window->ShowModal();
aResult->ShowModal();
if (NS_SUCCEEDED(gotParent))
parentWindowWidgetThing->Enable(PR_TRUE);
}

9
mozilla/xpfe/appshell/src/nsNetSupportDialog.cpp
View File

@@ -317,14 +317,9 @@ nsresult nsNetSupportDialog::DoDialog( nsString& inXULURL )
appShellService->Release();
return result;
}
result = appShellService->CreateDialogWindow( nsnull, dialogURL, PR_TRUE, mWebShellWindow, nsnull, this, 300, 150);
// Run the dialog
// Results will be in the XUL callback
if ( mWebShellWindow )
mWebShellWindow->ShowModal();
appShellService->RunModalDialog( nsnull, dialogURL, mWebShellWindow, nsnull, this, 300, 200);
// cleanup
if ( mOKButton )
RemoveEventListener( mOKButton );