From e3051d02098cd4dc0dabc27ca17749da7ea9af57 Mon Sep 17 00:00:00 2001 From: "bryner%uiuc.edu" Date: Mon, 9 Apr 2001 08:44:46 +0000 Subject: [PATCH] Syncing with danm's nsIDialogParamBlock changes. r=cls. Not part of build. git-svn-id: svn://10.0.0.236/trunk@91735 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/manager/pki/src/nsNSSDialogs.cpp | 13 ++++++------- .../security/manager/pki/src/nsPKIParamBlock.cpp | 5 ++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/mozilla/security/manager/pki/src/nsNSSDialogs.cpp b/mozilla/security/manager/pki/src/nsNSSDialogs.cpp index a5d7e84f561..b9f957daa2e 100644 --- a/mozilla/security/manager/pki/src/nsNSSDialogs.cpp +++ b/mozilla/security/manager/pki/src/nsNSSDialogs.cpp @@ -101,7 +101,6 @@ nsNSSDialogHelper::openDialog( } /* ==== */ -static NS_DEFINE_CID(kDialogParamBlockCID, NS_DialogParamBlock_CID); static NS_DEFINE_CID(kPKIParamBlockCID, NS_PKIPARAMBLOCK_CID); nsNSSDialogs::nsNSSDialogs() @@ -150,7 +149,7 @@ nsNSSDialogs::SetPassword(nsIInterfaceRequestor *ctx, // Get the parent window for the dialog nsCOMPtr parent = do_GetInterface(ctx); - nsCOMPtr block = do_CreateInstance(kDialogParamBlockCID); + nsCOMPtr block(do_CreateInstance("@mozilla.org/embedcomp/dialogparam;1")); if (!block) return NS_ERROR_FAILURE; // void ChangePassword(in wstring tokenName, out int status); @@ -183,7 +182,7 @@ nsNSSDialogs::GetPassword(nsIInterfaceRequestor *ctx, *_canceled = PR_FALSE; // Get the parent window for the dialog nsCOMPtr parent = do_GetInterface(ctx); - nsCOMPtr block = do_CreateInstance(kDialogParamBlockCID); + nsCOMPtr block(do_CreateInstance("@mozilla.org/embedcomp/dialogparam;1")); if (!block) return NS_ERROR_FAILURE; // Set the token name in the window rv = block->SetString(1, tokenName); @@ -561,7 +560,7 @@ nsNSSDialogs::DownloadCACert(nsIInterfaceRequestor *ctx, // Get the parent window for the dialog nsCOMPtr parent = do_GetInterface(ctx); - nsCOMPtr block = do_CreateInstance(kDialogParamBlockCID); + nsCOMPtr block(do_CreateInstance("@mozilla.org/embedcomp/dialogparam;1")); if (!block) return NS_ERROR_FAILURE; nsXPIDLString commonName; @@ -610,7 +609,7 @@ nsNSSDialogs::ChooseCertificate(nsIInterfaceRequestor *ctx, const PRUnichar *cn, // Get the parent window for the dialog nsCOMPtr parent = do_GetInterface(ctx); - nsCOMPtr block = do_CreateInstance(kDialogParamBlockCID); + nsCOMPtr block(do_CreateInstance("@mozilla.org/embedcomp/dialogparam;1")); if (!block) return NS_ERROR_FAILURE; // void ChangePassword(in wstring tokenName, out int status); @@ -665,7 +664,7 @@ nsNSSDialogs::SetPKCS12FilePassword(nsIInterfaceRequestor *ctx, *_canceled = PR_FALSE; // Get the parent window for the dialog nsCOMPtr parent = do_GetInterface(ctx); - nsCOMPtr block = do_CreateInstance(kDialogParamBlockCID); + nsCOMPtr block(do_CreateInstance("@mozilla.org/embedcomp/dialogparam;1")); if (!block) return NS_ERROR_FAILURE; // open up the window rv = nsNSSDialogHelper::openDialog(parent, @@ -698,7 +697,7 @@ nsNSSDialogs::GetPKCS12FilePassword(nsIInterfaceRequestor *ctx, *_canceled = PR_FALSE; // Get the parent window for the dialog nsCOMPtr parent = do_GetInterface(ctx); - nsCOMPtr block = do_CreateInstance(kDialogParamBlockCID); + nsCOMPtr block(do_CreateInstance("@mozilla.org/embedcomp/dialogparam;1")); if (!block) return NS_ERROR_FAILURE; // open up the window rv = nsNSSDialogHelper::openDialog(parent, diff --git a/mozilla/security/manager/pki/src/nsPKIParamBlock.cpp b/mozilla/security/manager/pki/src/nsPKIParamBlock.cpp index fe1924207ad..5ad6812e4a6 100644 --- a/mozilla/security/manager/pki/src/nsPKIParamBlock.cpp +++ b/mozilla/security/manager/pki/src/nsPKIParamBlock.cpp @@ -35,8 +35,7 @@ #include "nsPKIParamBlock.h" #include "nsIServiceManager.h" - -static NS_DEFINE_CID(kDialogParamBlockCID, NS_DialogParamBlock_CID); +#include "nsIDialogParamBlock.h" NS_IMPL_THREADSAFE_ISUPPORTS2(nsPKIParamBlock, nsIPKIParamBlock, nsIDialogParamBlock) @@ -49,7 +48,7 @@ nsPKIParamBlock::nsPKIParamBlock() : mSupports(nsnull),mNumISupports(0) nsresult nsPKIParamBlock::Init() { - mDialogParamBlock = do_CreateInstance(kDialogParamBlockCID); + mDialogParamBlock = do_CreateInstance("@mozilla.org/embedcomp/dialogparam;1"); return (mDialogParamBlock == nsnull) ? NS_ERROR_OUT_OF_MEMORY : NS_OK; }