mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Temporarily back out shaver's needed cleanup to remove wallet dependencies.

This commit is contained in:
brendan%mozilla.org 2000-09-13 21:49:39 +00:00
Родитель 44fddf3b1e
Коммит 62b6238e92
2 изменённых файлов: 16 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
Просмотреть файл

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

16
netwerk/protocol/http/src/nsHTTPChannel.cpp
Просмотреть файл

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