Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#18352: remove extensions/ dependencies. This breaks single-signon for now, r=valeski, a=brendan

Browse Source
This commit is contained in:
shaver%mozilla.org 2000-09-12 20:45:58 +00:00
parent 8bc06b07fe
commit 13f37d3aa4
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
View File

@ -36,11 +36,10 @@
#include "nsEscape.h" #include "nsEscape.h"
#include "nsNetUtil.h" #include "nsNetUtil.h"
#include "nsIDNSService.h" // for host error code #include "nsIDNSService.h" // for host error code
#include "nsIWalletService.h" #include "nsIPasswordManagerUtils.h"
#include "nsIProxy.h" #include "nsIProxy.h"
#include "nsIMemory.h" #include "nsIMemory.h"
static NS_DEFINE_CID(kWalletServiceCID, NS_WALLETSERVICE_CID);
static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID); static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID);
static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID);
static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
@ -974,24 +973,25 @@ nsFtpConnectionThread::R_pass() {
// kick back out to S_pass() and ask the user again. // kick back out to S_pass() and ask the user again.
nsresult rv = NS_OK; nsresult rv = NS_OK;
NS_WITH_SERVICE(nsIWalletService, walletService, kWalletServiceCID, &rv); NS_WITH_SERVICE(nsIPasswordManager, passwordManager,
PASSWORDMANAGER_PROGID, &rv);
if (NS_FAILED(rv)) return FTP_ERROR; if (NS_FAILED(rv)) return FTP_ERROR;
NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager, NS_WITH_SERVICE(nsIProxyObjectManager, pIProxyObjectManager,
kProxyObjectManagerCID, &rv); kProxyObjectManagerCID, &rv);
if (NS_FAILED(rv)) return FTP_ERROR; if (NS_FAILED(rv)) return FTP_ERROR;
nsCOMPtr<nsIWalletService> pWalletService; nsCOMPtr<nsIPasswordManager> pPasswordManager;
rv = pIProxyObjectManager->GetProxyForObject(NS_UI_THREAD_EVENTQ, rv = pIProxyObjectManager->GetProxyForObject(NS_UI_THREAD_EVENTQ,
NS_GET_IID(nsIWalletService), walletService, NS_GET_IID(nsIPasswordManager), passwordManager,
PROXY_SYNC, getter_AddRefs(pWalletService)); PROXY_SYNC, getter_AddRefs(pPasswordManager));
if (NS_FAILED(rv)) return FTP_ERROR; if (NS_FAILED(rv)) return FTP_ERROR;
nsXPIDLCString uri; nsXPIDLCString uri;
rv = mURL->GetSpec(getter_Copies(uri)); rv = mURL->GetSpec(getter_Copies(uri));
if (NS_FAILED(rv)) return FTP_ERROR; if (NS_FAILED(rv)) return FTP_ERROR;
rv = pWalletService->SI_RemoveUser(uri, nsnull); rv = pPasswordManager->RemoveUser(uri, nsnull);
if (NS_FAILED(rv)) return FTP_ERROR; if (NS_FAILED(rv)) return FTP_ERROR;
mRetryPass = PR_TRUE; mRetryPass = PR_TRUE;

16
netwerk/protocol/http/src/nsHTTPChannel.cpp
View File

@ -23,7 +23,6 @@
* Christopher Blizzard <blizzard@mozilla.org> * Christopher Blizzard <blizzard@mozilla.org>
*/ */
#include "nspr.h" #include "nspr.h"
#include "prlong.h" #include "prlong.h"
#include "nsHTTPChannel.h" #include "nsHTTPChannel.h"
@ -58,7 +57,7 @@
#include "nsIThread.h" #include "nsIThread.h"
#include "nsIEventQueueService.h" #include "nsIEventQueueService.h"
#include "nsIProxyObjectManager.h" #include "nsIProxyObjectManager.h"
#include "nsIWalletService.h" #include "nsIPasswordManagerUtils.h"
#include "netCore.h" #include "netCore.h"
// FIXME - Temporary include. Delete this when cache is enabled on all // FIXME - Temporary include. Delete this when cache is enabled on all
@ -68,7 +67,6 @@
static NS_DEFINE_CID(kNetModuleMgrCID, NS_NETMODULEMGR_CID); static NS_DEFINE_CID(kNetModuleMgrCID, NS_NETMODULEMGR_CID);
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
static NS_DEFINE_CID(kWalletServiceCID, NS_WALLETSERVICE_CID);
#if defined(PR_LOGGING) #if defined(PR_LOGGING)
extern PRLogModuleInfo* gHTTPLog; extern PRLogModuleInfo* gHTTPLog;
@ -2235,22 +2233,22 @@ nsHTTPChannel::ProcessStatusCode(void)
{ {
pEngine->SetAuthString(mURI, 0); pEngine->SetAuthString(mURI, 0);
NS_WITH_SERVICE(nsIWalletService, walletService, NS_WITH_SERVICE(nsIPasswordManager, passwordManager,
kWalletServiceCID, &rv); PASSWORDMANAGER_PROGID, &rv);
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
{ {
NS_WITH_SERVICE(nsIProxyObjectManager, pom, NS_WITH_SERVICE(nsIProxyObjectManager, pom,
kProxyObjectManagerCID, &rv); kProxyObjectManagerCID, &rv);
nsCOMPtr<nsIWalletService> pWalletService; nsCOMPtr<nsIPasswordManager> pPasswordManager;
if (NS_SUCCEEDED(pom->GetProxyForObject(NS_UI_THREAD_EVENTQ, if (NS_SUCCEEDED(pom->GetProxyForObject(NS_UI_THREAD_EVENTQ,
NS_GET_IID(nsIWalletService), walletService, NS_GET_IID(nsIPasswordManager), passwordManager,
PROXY_SYNC, getter_AddRefs(pWalletService)))) PROXY_SYNC, getter_AddRefs(pPasswordManager))))
{ {
nsXPIDLCString uri; nsXPIDLCString uri;
if (NS_SUCCEEDED(mURI->GetSpec(getter_Copies(uri)))) if (NS_SUCCEEDED(mURI->GetSpec(getter_Copies(uri))))
pWalletService->SI_RemoveUser(uri, nsnull); pPasswordManager->RemoveUser(uri, nsnull);
} }
} }