From 60db9a83a1083c39ac244cd2a7d1535f94a08732 Mon Sep 17 00:00:00 2001
From: "kaie%netscape.com" <kaie%netscape.com>
Date: Wed, 5 Sep 2001 21:27:22 +0000
Subject: [PATCH] Checking in for valeski. In case of problems you can reach me
 at kai.engert@gmx.de r=dbaron, sr=dougt. 97667. nsIInterfaceRequestor is now
 frozen. nsIInterfaceRequestorUtils.h is now required if you want to use
 do_GetInterface() for convenience. The two were split because the stuff that
 is now in nsIInterfaceRequestorUtils.h wasn't ready for freezing. Also, .idl
 files should just contain interface defs anyway.

---
 security/manager/pki/src/nsNSSDialogs.cpp          | 1 +
 security/manager/ssl/src/nsNSSCallbacks.cpp        | 1 +
 security/manager/ssl/src/nsNSSHelper.h             | 1 +
 security/manager/ssl/src/nsNSSIOLayer.h            | 1 +
 security/manager/ssl/src/nsSDR.cpp                 | 1 +
 security/manager/ssl/src/nsSecureBrowserUIImpl.cpp | 3 +++
 6 files changed, 8 insertions(+)

diff --git a/security/manager/pki/src/nsNSSDialogs.cpp b/security/manager/pki/src/nsNSSDialogs.cpp
index 0dd19392fb98..19530f734953 100644
--- a/security/manager/pki/src/nsNSSDialogs.cpp
+++ b/security/manager/pki/src/nsNSSDialogs.cpp
@@ -36,6 +36,7 @@
 #include "nsIStringBundle.h"
 #include "nsIPref.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIX509Cert.h"
 #include "nsIX509CertDB.h"
 #include "nsILocaleService.h"
diff --git a/security/manager/ssl/src/nsNSSCallbacks.cpp b/security/manager/ssl/src/nsNSSCallbacks.cpp
index 70e0ed233d09..f8f4798eb106 100644
--- a/security/manager/ssl/src/nsNSSCallbacks.cpp
+++ b/security/manager/ssl/src/nsNSSCallbacks.cpp
@@ -35,6 +35,7 @@
 #include "nsIPrompt.h"
 #include "nsProxiedService.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 
 #include "ssl.h"
 #include "cert.h"
diff --git a/security/manager/ssl/src/nsNSSHelper.h b/security/manager/ssl/src/nsNSSHelper.h
index c4d63b0c6c41..875e44e5933a 100644
--- a/security/manager/ssl/src/nsNSSHelper.h
+++ b/security/manager/ssl/src/nsNSSHelper.h
@@ -37,6 +37,7 @@
 #define NSS_HELPER_
 
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "pk11func.h"
 
 //
diff --git a/security/manager/ssl/src/nsNSSIOLayer.h b/security/manager/ssl/src/nsNSSIOLayer.h
index a5ab063d7ed8..076ea6a0e646 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.h
+++ b/security/manager/ssl/src/nsNSSIOLayer.h
@@ -28,6 +28,7 @@
 #include "prio.h"
 #include "nsString.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsITransportSecurityInfo.h"
 #include "nsISSLSocketControl.h"
 #include "nsISSLStatus.h"
diff --git a/security/manager/ssl/src/nsSDR.cpp b/security/manager/ssl/src/nsSDR.cpp
index 563127e17940..e87e1402f423 100644
--- a/security/manager/ssl/src/nsSDR.cpp
+++ b/security/manager/ssl/src/nsSDR.cpp
@@ -30,6 +30,7 @@
 #include "nsCOMPtr.h"
 #include "nsISupports.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIServiceManager.h"
 #include "nsISecurityManagerComponent.h"
 #include "nsIWindowWatcher.h"
diff --git a/security/manager/ssl/src/nsSecureBrowserUIImpl.cpp b/security/manager/ssl/src/nsSecureBrowserUIImpl.cpp
index aff9f82333ac..35aa08e03182 100644
--- a/security/manager/ssl/src/nsSecureBrowserUIImpl.cpp
+++ b/security/manager/ssl/src/nsSecureBrowserUIImpl.cpp
@@ -37,6 +37,7 @@
 #include "nsNSSComponent.h"
 #include "nsCOMPtr.h"
 #include "nsIInterfaceRequestor.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsIServiceManager.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIObserverService.h"
@@ -116,6 +117,8 @@ NS_IMETHODIMP
 nsSecureBrowserUIImpl::Init(nsIDOMWindow *window,
                             nsIDOMElement *button)
 {
+fprintf(stderr, "===> nsSecureBrowserUIImpl::Init\n");
+
   nsresult rv = NS_OK;
   mSecurityButton = button;  /* may be null */
   mWindow = window;