replace /*nsIDOMEditorAppCore*/nsISupports by nsIEditorShell

mailnews/compose/public/nsIMsgCompose.idl

@@ -19,7 +19,7 @@
 #include "nsISupports.idl"
 #include "domstubs.idl"
 #include "nsIMsgCompFields.idl"
-/* #include "nsIDOMEditorAppCore.idl" */
+#include "nsIEditorShell.idl"
 
 %{ C++
 #include "nsIDOMWindow.h"
@@ -99,7 +99,7 @@ interface nsIMsgCompose : nsISupports {
     void CloseWindow();
     
 	/* ... */
-	attribute /*nsIDOMEditorAppCore*/nsISupports editor;
+	attribute nsIEditorShell editor;
 
 	/* ... */
     readonly attribute nsIDOMWindow domWindow;

mailnews/compose/src/nsMsgCompose.cpp

@@ -287,8 +287,9 @@ nsresult nsMsgCompose::SendMsgEx(MSG_DeliverMode deliverMode, const PRUnichar *a
 	  printf("----------------------------\n");
 	  printf("--  Sending Mail Message  --\n");
 	  printf("----------------------------\n");
-	  printf("To: %s  Cc: %s  Bcc: %s\n", addrTo, addrCc, addrBcc);
-	  printf("Subject: %s  \nMsg: %s\n", subject, body);
+	  printf("To: %s  Cc: %s  Bcc: %s\n", (const char *)nsAutoCString(addrTo),
+	  	(const char *)nsAutoCString(addrCc), (const char *)nsAutoCString(addrBcc));
+	  printf("Subject: %s  \nMsg: %s\n", (const char *)nsAutoCString(subject), (const char *)nsAutoCString(body));
 	  printf("----------------------------\n");
 #endif //DEBUG
 
@@ -406,20 +407,23 @@ nsresult nsMsgCompose::CloseWindow()
 }
 
 
-nsresult nsMsgCompose::GetEditor(/*nsIDOMEditorAppCore*/nsISupports * *aEditor)
+nsresult nsMsgCompose::GetEditor(nsIEditorShell * *aEditor)
 {
 	*aEditor = nsnull;
 	return NS_OK;
 }
 
 
-nsresult nsMsgCompose::SetEditor(/*nsIDOMEditorAppCore*/nsISupports * aEditor)
+nsresult nsMsgCompose::SetEditor(nsIEditorShell * aEditor)
 {
 	nsresult rv;
+/*
 	if (aEditor)
 		rv = aEditor->QueryInterface(nsIEditorShell::GetIID(), (void **)&m_editor);
 	else
 		return NS_ERROR_NULL_POINTER;
+*/
+	m_editor = aEditor;
 
 	return rv;
 }

mailnews/compose/src/nsMsgCompose.h

@@ -56,8 +56,8 @@ class nsMsgCompose : public nsIMsgCompose
 	NS_IMETHOD CloseWindow();
 
 	/* attribute nsIDOMEditorAppCore editor; */
-	NS_IMETHOD GetEditor(/*nsIDOMEditorAppCore*/nsISupports * *aEditor);
-	NS_IMETHOD SetEditor(/*nsIDOMEditorAppCore*/nsISupports * aEditor);
+	NS_IMETHOD GetEditor(nsIEditorShell * *aEditor);
+	NS_IMETHOD SetEditor(nsIEditorShell * aEditor);
 
 	/* readonly attribute nsIDOMWindow domWindow; */
 	NS_IMETHOD GetDomWindow(nsIDOMWindow * *aDomWindow);