From 919d511ca1f9f1a16b65718723073b10198b6dff Mon Sep 17 00:00:00 2001
From: "valeski%netscape.com" <valeski%netscape.com>
Date: Tue, 8 Jun 1999 20:11:53 +0000
Subject: [PATCH] added moduelMgr and ModRegEntry idls to the idl list. also
 updated the nsINetModuleMgr.idl interface

---
 netwerk/base/public/makefile.win        |  2 ++
 netwerk/base/public/nsINetModuleMgr.idl | 29 +++++++++++++++++--------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/netwerk/base/public/makefile.win b/netwerk/base/public/makefile.win
index 624537b4e376..6a600a8b316c 100644
--- a/netwerk/base/public/makefile.win
+++ b/netwerk/base/public/makefile.win
@@ -38,6 +38,8 @@ XPIDLSRCS =                        \
         .\nsIPrompt.idl            \
         .\nsIProtocolHandler.idl   \
         .\nsIProgressEventSink.idl \
+	.\nsINetModRegEntry.idl    \
+	.\nsINetModuleMgr.idl      \
 	.\nsINetNotify.idl         \
         $(NULL)
 
diff --git a/netwerk/base/public/nsINetModuleMgr.idl b/netwerk/base/public/nsINetModuleMgr.idl
index 4e4413951a93..60f77838ecdf 100644
--- a/netwerk/base/public/nsINetModuleMgr.idl
+++ b/netwerk/base/public/nsINetModuleMgr.idl
@@ -29,34 +29,45 @@
  */
 
 #include "nsISupports.idl"
+#include "nsIEnumerator.idl"
+#include "nsINetNotify.idl"
+
+interface nsIEventQueue;
+
+%{ C++
+
+// {4EBDAFE0-13BA-11d3-A15A-0050041CAF44}
+#define NS_NETMODULEMGR_CID \
+{ 0x4ebdafe0, 0x13ba, 0x11d3, { 0xa1, 0x5a, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } }
+%}
 
 [scriptable, uuid(ff9ead40-0ef2-11d3-9de6-0010a4053fd0)]
-interface nsINetModuleMgr : nsISupports, nsIObserverService {
+interface nsINetModuleMgr : nsISupports {
 	
     // Register the external module to receive notifications.
     // 
     // ARGUMENTS:
-    // aComponent: The internal component that the external module wants to monitor.
+    // aTopic: The internal component that the external module wants to monitor.
     // aEventQueue: The event queue to receive the events.
     // aNotify: The external module interface methods to be called when an event is fired.
     //
     // RETURNS: nsresult
-	void RegisterModule(in string aComponent, in nsIEventQueue* aEventQueue, in nsINetNotify aNotify);
+	void RegisterModule(in string aTopic, in nsIEventQueue aEventQueue, in nsINetNotify aNotify, in nsCIDPtr aCID);
 
     // Unregister the external module. Removes the nsINetModuleMgr binding between
     // internal component and external module.
     //
     // ARGUMENTS:
-    // aComponent: The internal component being monitored.
+    // aTopic: The internal component being monitored.
     // aNotify: The external modules notification module.
     //
     // RETURNS: nsresult
-    void UnregisterModule(in string aComponent, in nsINetNotify aNotify);
+    void UnregisterModule(in string aTopic, in nsIEventQueue aEventQueue, in nsINetNotify aNotify, in nsCIDPtr aCID);
 
-    // Enumerates all the registered modules for the specified component.
+    // Enumerates all the registered modules for the specified topic.
     //
     // ARGUMENTS:
-    // aComponent: the component to get all the notifiers for.
-    // aNotifiers: the array of notifiers.
-    void EnumerateModules(in string aComponent, out nsINetNotify* ** aNotifiers);
+    // aTopic: the component to get all the notifiers for.
+    // aEnumerator: the array of notifiers.
+    void EnumerateModules(in string aTopic, out nsISimpleEnumerator aEnumerator);
 };
\ No newline at end of file