diff --git a/mozilla/editor/idl/MANIFEST b/mozilla/editor/idl/MANIFEST
index 7132fa091c4..4ac74295702 100644
--- a/mozilla/editor/idl/MANIFEST
+++ b/mozilla/editor/idl/MANIFEST
@@ -34,6 +34,7 @@ nsICiter.idl
 nsIEditActionListener.idl
 nsIEditorIMESupport.idl
 nsIEditorObserver.idl
+nsIEditorLogging.idl
 nsIEditorMailSupport.idl
 nsIEditorStyleSheets.idl
 nsITableEditor.idl
diff --git a/mozilla/editor/idl/Makefile.in b/mozilla/editor/idl/Makefile.in
index a9efc0d7419..c497669b848 100644
--- a/mozilla/editor/idl/Makefile.in
+++ b/mozilla/editor/idl/Makefile.in
@@ -35,6 +35,7 @@ XPIDLSRCS	= \
 		nsIEditorController.idl \
 		nsIEditor.idl \
 		nsIEditorIMESupport.idl \
+		nsIEditorLogging.idl \
 		nsIEditorMailSupport.idl \
 		nsIEditorObserver.idl \
 		nsIEditorService.idl \
diff --git a/mozilla/editor/public/nsIEditorLogging.h b/mozilla/editor/idl/nsIEditorLogging.idl
similarity index 74%
rename from mozilla/editor/public/nsIEditorLogging.h
rename to mozilla/editor/idl/nsIEditorLogging.idl
index 1d52780ddab..61be19f190f 100644
--- a/mozilla/editor/public/nsIEditorLogging.h
+++ b/mozilla/editor/idl/nsIEditorLogging.idl
@@ -16,10 +16,11 @@
  *
  * The Initial Developer of the Original Code is 
  * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
+ * Portions created by the Initial Developer are Copyright (C) 1998-2002
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ *   Akkana Peck <akkana@netscape.com>
  *
  *
  * Alternatively, the contents of this file may be used under the terms of
@@ -36,33 +37,20 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef nsIEditorLogging_h__
-#define nsIEditorLogging_h__
-#include "nsISupports.h"
-#include "nscore.h"
+#include "nsISupports.idl"
 
+interface nsIFile;
 
-#define NS_IEDITORLOGGING_IID                            \
-{ /* 4805e681-49b9-11d3-9ce4-ed60bd6cb5bc} */            \
-0x4805e681, 0x49b9, 0x11d3,                              \
-{ 0x9c, 0xe4, 0xed, 0x60, 0xbd, 0x6c, 0xb5, 0xbc } }
+[scriptable, uuid(4805e681-49b9-11d3-9ce4-ed60bd6cb5bc)]
 
-
-class nsIFileSpec;
-
-class nsIEditorLogging : public nsISupports
+interface nsIEditorLogging : nsISupports
 {
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IEDITORLOGGING_IID)
+  /** Start logging.
+    */
+  void startLogging(in nsIFile aLogFile);
 
-
-  /* Start logging */
-  NS_IMETHOD StartLogging(nsIFile *aLogFile)=0;
-
-  /* Stop logging */
-  NS_IMETHOD StopLogging()=0;
-  
+  /** Stop logging.
+    */
+  void stopLogging();
 };
 
-
-#endif // nsIEditorLogging_h__
diff --git a/mozilla/editor/public/MANIFEST b/mozilla/editor/public/MANIFEST
index 20679a97493..1ddc2522525 100644
--- a/mozilla/editor/public/MANIFEST
+++ b/mozilla/editor/public/MANIFEST
@@ -21,4 +21,3 @@
 #
 
 nsEditorCID.h
-nsIEditorLogging.h
diff --git a/mozilla/editor/public/Makefile.in b/mozilla/editor/public/Makefile.in
index 06fc1bcd7b2..1f5ad14c353 100644
--- a/mozilla/editor/public/Makefile.in
+++ b/mozilla/editor/public/Makefile.in
@@ -30,7 +30,6 @@ MODULE		= editor
 
 EXPORTS		= \
 		nsEditorCID.h \
-		nsIEditorLogging.h \
 		$(NULL)
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
diff --git a/mozilla/editor/ui/composer/content/EditorCommandsDebug.js b/mozilla/editor/ui/composer/content/EditorCommandsDebug.js
index 783c971f24d..1f3979893ab 100644
--- a/mozilla/editor/ui/composer/content/EditorCommandsDebug.js
+++ b/mozilla/editor/ui/composer/content/EditorCommandsDebug.js
@@ -356,10 +356,9 @@ function EditorGetScriptFileSpec()
 
 function EditorStartLog()
 {
-  var fs;
-
-  fs = EditorGetScriptFileSpec();
-  editorShell.StartLogging(fs);
+  var edlog = gEditor.QueryInterface(Components.interfaces.nsIEditorLogging);
+  var fs = EditorGetScriptFileSpec();
+  edlog.startLogging(fs);
   window._content.focus();
 
   fs = null;
@@ -367,7 +366,8 @@ function EditorStartLog()
 
 function EditorStopLog()
 {
-  editorShell.StopLogging();
+  var edlog = gEditor.QueryInterface(Components.interfaces.nsIEditorLogging);
+  edlog.stopLogging();
   window._content.focus();
 }