IDL-ify three more interfaces

mailnews/base/public/Makefile.in

@@ -23,23 +23,25 @@ MODULE		= mailnews
 
 include $(DEPTH)/config/autoconf.mk
 XPIDLSRCS =				  \
-		nsIFolder.idl		\
+		nsICopyMessageListener.idl	\
-		nsIMsgHost.idl		  \
-		nsIMsgFolder.idl	  \
 		nsIDOMMsgAppCore.idl	\
-		nsIMsgGroupRecord.idl   \
+		nsIFolder.idl		\
-		nsIMsgIncomingServer.idl	\
-		nsIMsgThread.idl	\
-		nsIMsgMessageService.idl \
-		nsIUrlListener.idl	\
 		nsIFolderListener.idl	\
-		nsIMsgIdentity.idl			\
+		nsIMessage.idl			\
-		nsIMsgIncomingServer.idl	\
+		nsIMessageView.idl		\
 		nsIMsgAccount.idl			\
 		nsIMsgAccountManager.idl	\
+		nsIMsgFolder.idl	  \
+		nsIMsgGroupRecord.idl   \
+		nsIMsgHost.idl		  \
+		nsIMsgIdentity.idl			\
+		nsIMsgIncomingServer.idl	\
 		nsIMsgMailSession.idl	\
+		nsIMsgMessageService.idl \
 		nsIMsgSignature.idl		\
+		nsIMsgThread.idl	\
 		nsIMsgVCard.idl			\
+		nsIUrlListener.idl	\
 		$(NULL)
 
 EXPORTS =				\

mailnews/base/public/nsICopyMessageListener.h

@@ -7,11 +7,9 @@
 
 #include "nsISupports.h" /* interface nsISupports */
 #include "nsIMsgThread.h" /* interface nsIMsgThread */
-#include "nsISupportsArray.h" /* interface nsISupportsArray */
+#include "nsIMsgIncomingServer.h" /* interface nsIMsgIncomingServer */
 #include "MailNewsTypes.h" /* interface MailNewsTypes */
 #include "nsICollection.h" /* interface nsICollection */
-#include "nsIInputStream.h" /* interface nsIInputStream */
-#include "nsIBaseStream.h" /* interface nsIBaseStream */
 #include "nsIMsgFolder.h" /* interface nsIMsgFolder */
 #include "nsIFolderListener.h" /* interface nsIFolderListener */
 #include "nsrootidl.h" /* interface nsrootidl */
@@ -19,10 +17,9 @@
 #include "nsIEnumerator.h" /* interface nsIEnumerator */
 #include "nsIMessage.h" /* interface nsIMessage */
 #include "nsIFolder.h" /* interface nsIFolder */
+class nsIInputStream; /* forward decl */
+#include "nsIInputStream.h";
 
-#ifdef XPIDL_JS_STUBS
-#include "jsapi.h"
-#endif
 
 /* starting interface:    nsICopyMessageListener */
 
@@ -44,11 +41,6 @@ class nsICopyMessageListener : public nsISupports {
 
   /* void EndCopy (in boolean copySucceeded); */
   NS_IMETHOD EndCopy(PRBool copySucceeded) = 0;
-
-#ifdef XPIDL_JS_STUBS
-  static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
-  static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsICopyMessageListener *priv);
-#endif
 };
 
 #endif /* __gen_nsICopyMessageListener_h__ */

mailnews/base/public/nsICopyMessageListener.idl

@@ -17,9 +17,13 @@
  */
 
 #include "nsISupports.idl"
-#include "nsIInputStream.idl"
 #include "nsIMessage.idl"
 
+interface nsIInputStream;
+
+%{C++
+#include "nsIInputStream.h";
+%}
 
 [scriptable, uuid(53CA78FE-E231-11d2-8A4D-0060B0FC04D2)]
 

mailnews/base/public/nsIMessage.h

@@ -1,72 +0,0 @@
-/*
- * DO NOT EDIT.  THIS FILE IS GENERATED FROM nsIMessage.idl
- */
-
-#ifndef __gen_nsIMessage_h__
-#define __gen_nsIMessage_h__
-
-#include "nsISupports.h" /* interface nsISupports */
-#include "nsIMsgThread.h" /* interface nsIMsgThread */
-#include "MailNewsTypes.h" /* interface MailNewsTypes */
-#include "nsICollection.h" /* interface nsICollection */
-#include "nsIMsgFolder.h" /* interface nsIMsgFolder */
-#include "nsIFolderListener.h" /* interface nsIFolderListener */
-#include "nsIMsgHdr.h" /* interface nsIMsgHdr */
-#include "nsrootidl.h" /* interface nsrootidl */
-#include "nsIEnumerator.h" /* interface nsIEnumerator */
-#include "nsIFolder.h" /* interface nsIFolder */
-
-#ifdef XPIDL_JS_STUBS
-#include "jsapi.h"
-#endif
-class nsIMsgFolder; /* forward decl */
-
-/* starting interface:    nsIMessage */
-
-/* {5B926BB4-F839-11d2-8A5F-0060B0FC04D2} */
-#define NS_IMESSAGE_IID_STR "5B926BB4-F839-11d2-8A5F-0060B0FC04D2"
-#define NS_IMESSAGE_IID \
-  {0x5B926BB4, 0xF839, 0x11d2, \
-    { 0x8A, 0x5F, 0x00, 0x60, 0xB0, 0xFC, 0x04, 0xD2 }}
-
-class nsIMessage : public nsIMsgHdr {
- public: 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMESSAGE_IID)
-
-  /* nsIMsgFolder GetMsgFolder (); */
-  NS_IMETHOD GetMsgFolder(nsIMsgFolder **_retval) = 0;
-
-  /* void SetMsgFolder (in nsIMsgFolder folder); */
-  NS_IMETHOD SetMsgFolder(nsIMsgFolder *folder) = 0;
-
-#ifdef XPIDL_JS_STUBS
-  static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
-  static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsIMessage *priv);
-#endif
-};
-
-/* starting interface:    nsIDBMessage */
-
-/* {82702556-01A2-11d3-8A69-0060B0FC04D2} */
-#define NS_IDBMESSAGE_IID_STR "82702556-01A2-11d3-8A69-0060B0FC04D2"
-#define NS_IDBMESSAGE_IID \
-  {0x82702556, 0x01A2, 0x11d3, \
-    { 0x8A, 0x69, 0x00, 0x60, 0xB0, 0xFC, 0x04, 0xD2 }}
-
-class nsIDBMessage : public nsIMessage {
- public: 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDBMESSAGE_IID)
-
-  /* void SetMsgDBHdr (in nsIMsgDBHdr hdr); */
-  NS_IMETHOD SetMsgDBHdr(nsIMsgDBHdr *hdr) = 0;
-
-  /* nsIMsgDBHdr GetMsgDBHdr (); */
-  NS_IMETHOD GetMsgDBHdr(nsIMsgDBHdr **_retval) = 0;
-
-#ifdef XPIDL_JS_STUBS
-  static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
-  static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsIDBMessage *priv);
-#endif
-};
-
-#endif /* __gen_nsIMessage_h__ */

mailnews/base/public/nsIMessage.idl

@@ -19,8 +19,6 @@
 #include "nsIMsgHdr.idl"
 #include "nsIMsgFolder.idl"
 
-interface nsIMsgFolder;
-
 [scriptable, uuid(5B926BB4-F839-11d2-8A5F-0060B0FC04D2)]
 interface nsIMessage : nsIMsgHdr {
 

mailnews/base/public/nsIMessageView.h

@@ -1,48 +0,0 @@
-/*
- * DO NOT EDIT.  THIS FILE IS GENERATED FROM nsIMessageView.idl
- */
-
-#ifndef __gen_nsIMessageView_h__
-#define __gen_nsIMessageView_h__
-
-#include "nsISupports.h" /* interface nsISupports */
-#include "nsrootidl.h" /* interface nsrootidl */
-
-#ifdef XPIDL_JS_STUBS
-#include "jsapi.h"
-#endif
-
-/* starting interface:    nsIMessageView */
-
-/* {14495572-E945-11d2-8A52-0060B0FC04D2} */
-#define NS_IMESSAGEVIEW_IID_STR "14495572-E945-11d2-8A52-0060B0FC04D2"
-#define NS_IMESSAGEVIEW_IID \
-  {0x14495572, 0xE945, 0x11d2, \
-    { 0x8A, 0x52, 0x00, 0x60, 0xB0, 0xFC, 0x04, 0xD2 }}
-
-class nsIMessageView : public nsISupports {
- public: 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMESSAGEVIEW_IID)
-
-  /* void SetShowAll (); */
-  NS_IMETHOD SetShowAll() = 0;
-
-  /* void SetShowUnread (); */
-  NS_IMETHOD SetShowUnread() = 0;
-
-  /* void SetShowRead (); */
-  NS_IMETHOD SetShowRead() = 0;
-
-  /* void SetShowWatched (); */
-  NS_IMETHOD SetShowWatched() = 0;
-
-  /* void SetShowThreads (in boolean showThreads); */
-  NS_IMETHOD SetShowThreads(PRBool showThreads) = 0;
-
-#ifdef XPIDL_JS_STUBS
-  static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
-  static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsIMessageView *priv);
-#endif
-};
-
-#endif /* __gen_nsIMessageView_h__ */