From eb9c8b3477ceeebd7d6890e2147fd3baeb841e8d Mon Sep 17 00:00:00 2001 From: "morse@netscape.com" Date: Sat, 3 Apr 1999 22:56:18 +0000 Subject: [PATCH] moved single signon out of netlib --- layout/forms/nsTextControlFrame.cpp | 12 ++++++------ layout/html/forms/src/nsFormFrame.cpp | 11 ++++------- layout/html/forms/src/nsTextControlFrame.cpp | 12 ++++++------ 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp index 12f1cbba372a..e5998786d9e9 100644 --- a/layout/forms/nsTextControlFrame.cpp +++ b/layout/forms/nsTextControlFrame.cpp @@ -50,10 +50,10 @@ #include "nsIDocument.h" #include "prmem.h" #include "nsIURL.h" -#include "nsINetService.h" +#include "nsIWalletService.h" #include "nsIServiceManager.h" -static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID); -static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID); +static NS_DEFINE_IID(kIWalletServiceIID, NS_IWALLETSERVICE_IID); +static NS_DEFINE_IID(kWalletServiceCID, NS_WALLETSERVICE_CID); #endif static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); @@ -504,9 +504,9 @@ nsTextControlFrame::PostCreateWidget(nsIPresContext* aPresContext, if (nsnull != URLName) { /* invoke single-signon to get previously-used value of text */ - nsINetService *service; - nsresult res = nsServiceManager::GetService(kNetServiceCID, - kINetServiceIID, + nsIWalletService *service; + nsresult res = nsServiceManager::GetService(kWalletServiceCID, + kIWalletServiceIID, (nsISupports **)&service); if ((NS_OK == res) && (nsnull != service)) { char* valueString = NULL; diff --git a/layout/html/forms/src/nsFormFrame.cpp b/layout/html/forms/src/nsFormFrame.cpp index 4fd8a8e3a5a1..9fe651a0580e 100644 --- a/layout/html/forms/src/nsFormFrame.cpp +++ b/layout/html/forms/src/nsFormFrame.cpp @@ -74,12 +74,9 @@ static NS_DEFINE_IID(kIDocumentViewerIID, NS_IDOCUMENT_VIEWER_IID); #ifdef SingleSignon #define FORM_TYPE_TEXT 1 #define FORM_TYPE_PASSWORD 7 -#include "nsINetService.h" -static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID); -static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID); #endif -#ifdef ClientWallet +#if defined(ClientWallet) || defined(SingleSignon) #include "nsIWalletService.h" static NS_DEFINE_IID(kIWalletServiceIID, NS_IWALLETSERVICE_IID); static NS_DEFINE_IID(kWalletServiceCID, NS_WALLETSERVICE_CID); @@ -847,9 +844,9 @@ void nsFormFrame::ProcessAsURLEncoded(PRBool isPost, nsString& aData, nsIFormCon } #ifdef SingleSignon - nsINetService *service; - nsresult res = nsServiceManager::GetService(kNetServiceCID, - kINetServiceIID, + nsIWalletService *service; + nsresult res = nsServiceManager::GetService(kWalletServiceCID, + kIWalletServiceIID, (nsISupports **)&service); if ((NS_OK == res) && (nsnull != service)) { res = service->SI_RememberSignonData diff --git a/layout/html/forms/src/nsTextControlFrame.cpp b/layout/html/forms/src/nsTextControlFrame.cpp index 12f1cbba372a..e5998786d9e9 100644 --- a/layout/html/forms/src/nsTextControlFrame.cpp +++ b/layout/html/forms/src/nsTextControlFrame.cpp @@ -50,10 +50,10 @@ #include "nsIDocument.h" #include "prmem.h" #include "nsIURL.h" -#include "nsINetService.h" +#include "nsIWalletService.h" #include "nsIServiceManager.h" -static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID); -static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID); +static NS_DEFINE_IID(kIWalletServiceIID, NS_IWALLETSERVICE_IID); +static NS_DEFINE_IID(kWalletServiceCID, NS_WALLETSERVICE_CID); #endif static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); @@ -504,9 +504,9 @@ nsTextControlFrame::PostCreateWidget(nsIPresContext* aPresContext, if (nsnull != URLName) { /* invoke single-signon to get previously-used value of text */ - nsINetService *service; - nsresult res = nsServiceManager::GetService(kNetServiceCID, - kINetServiceIID, + nsIWalletService *service; + nsresult res = nsServiceManager::GetService(kWalletServiceCID, + kIWalletServiceIID, (nsISupports **)&service); if ((NS_OK == res) && (nsnull != service)) { char* valueString = NULL;