Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for #37673. get the password dialog to work again if we don't have a msg window.

Browse Source 
r=mscott
This commit is contained in:
sspitzer%netscape.com 2000-05-31 04:48:31 +00:00
parent c1de4be154
commit 8bfb5a6f05
2 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mailnews/base/util/nsMsgIncomingServer.cpp
View File

@ -46,11 +46,9 @@
#include "nsIWebShellWindow.h"
#include "nsIPrompt.h"
#include "nsIWalletService.h"
#include "nsINetSupportDialogService.h"
#include "nsIRDFService.h"
#include "nsIAppShellService.h"
#include "nsAppShellCIDs.h"
#include "nsIXULWindow.h"
#include "nsRDFCID.h"
#include "nsIInterfaceRequestor.h"
@ -61,7 +59,7 @@
static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kWalletServiceCID, NS_WALLETSERVICE_CID);
static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
static NS_DEFINE_CID(kMsgFilterServiceCID, NS_MSGFILTERSERVICE_CID);
MOZ_DECL_CTOR_COUNTER(nsMsgIncomingServer);
@ -622,18 +620,12 @@ nsMsgIncomingServer::GetPasswordWithUI(const PRUnichar * aPromptMessage, const
nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(docShell, &rv));
if (NS_FAILED(rv)) return rv;
dialog = do_GetInterface(webShell, &rv);
if (NS_FAILED(rv)) return rv;
}
else
{
NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID,
&rv);
if (NS_SUCCEEDED(rv))
{
nsCOMPtr<nsIXULWindow> hiddenWindow;
rv = appShell->GetHiddenWindow(getter_AddRefs(hiddenWindow));
if (NS_SUCCEEDED(rv))
dialog = do_QueryInterface(hiddenWindow, &rv);
}
dialog = do_GetService(kNetSupportDialogCID, &rv);
if (NS_FAILED(rv)) return rv;
}
if (NS_SUCCEEDED(rv) && dialog)
{

38
mailnews/news/src/nsNewsFolder.cpp
View File

@ -67,9 +67,7 @@
#include "nsINntpUrl.h"
#include "nsNewsSummarySpec.h"
#include "nsIAppShellService.h"
#include "nsIXULWindow.h"
#include "nsAppShellCIDs.h"
#include "nsINetSupportDialogService.h"
#include "nsIInterfaceRequestor.h"
// we need this because of an egcs 1.0 (and possibly gcc) compiler bug
@ -83,7 +81,7 @@ static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID);
static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
static NS_DEFINE_CID(kWalletServiceCID, NS_WALLETSERVICE_CID);
static NS_DEFINE_CID(kStandardUrlCID, NS_STANDARDURL_CID);
static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
#define PREF_NEWS_ABBREVIATE_PRETTY_NAMES "news.abbreviate_pretty_name"
@ -1379,8 +1377,9 @@ nsMsgNewsFolder::GetGroupPasswordWithUI(const PRUnichar * aPromptMessage, const
// prompt the user for the password
nsCOMPtr<nsIPrompt> dialog;
NS_ASSERTION(aMsgWindow,"no msg window, fix this, for now, use the hidden window");
#ifdef DEBUG_seth
NS_ASSERTION(aMsgWindow,"no msg window");
#endif
if (aMsgWindow) {
nsCOMPtr<nsIDocShell> docShell;
@ -1394,16 +1393,7 @@ nsMsgNewsFolder::GetGroupPasswordWithUI(const PRUnichar * aPromptMessage, const
if (NS_FAILED(rv)) return rv;
}
else {
nsCOMPtr <nsIAppShellService> appshellservice = do_GetService(kAppShellServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
if (!appshellservice) return NS_ERROR_FAILURE;
nsCOMPtr<nsIXULWindow> xulWindow;
rv = appshellservice->GetHiddenWindow(getter_AddRefs(xulWindow));
if (NS_FAILED(rv)) return rv;
if (!xulWindow) return NS_ERROR_FAILURE;
dialog = do_GetInterface(xulWindow, &rv);
dialog = do_GetService(kNetSupportDialogCID, &rv);
if (NS_FAILED(rv)) return rv;
}
@ -1454,8 +1444,9 @@ nsMsgNewsFolder::GetGroupUsernameWithUI(const PRUnichar * aPromptMessage, const
// prompt the user for the username
nsCOMPtr<nsIPrompt> dialog;
NS_ASSERTION(aMsgWindow,"no msg window, fix this, for now, use the hidden window");
#ifdef DEBUG_seth
NS_ASSERTION(aMsgWindow,"no msg window");
#endif
if (aMsgWindow) {
// prompt the user for the password
nsCOMPtr<nsIDocShell> docShell;
@ -1467,16 +1458,7 @@ nsMsgNewsFolder::GetGroupUsernameWithUI(const PRUnichar * aPromptMessage, const
if (NS_FAILED(rv)) return rv;
}
else {
nsCOMPtr <nsIAppShellService> appshellservice = do_GetService(kAppShellServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
if (!appshellservice) return NS_ERROR_FAILURE;
nsCOMPtr<nsIXULWindow> xulWindow;
rv = appshellservice->GetHiddenWindow(getter_AddRefs(xulWindow));
if (NS_FAILED(rv)) return rv;
if (!xulWindow) return NS_ERROR_FAILURE;
dialog = do_GetInterface(xulWindow, &rv);
dialog = do_GetService(kNetSupportDialogCID, &rv);
if (NS_FAILED(rv)) return rv;
}