From 7ac8a438ccf14039417b91927e3a9eead51edcdc Mon Sep 17 00:00:00 2001
From: "rhp%netscape.com"
 <rhp%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 7 Jun 1999 19:14:45 +0000
Subject: [PATCH] Fixes for recent checkins

git-svn-id: svn://10.0.0.236/trunk@34018 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/compose/src/Makefile.in                | 1 +
 mozilla/mailnews/compose/src/msgCompGlue.cpp            | 3 ++-
 mozilla/mailnews/compose/src/nsMsgAttachmentHandler.cpp | 1 -
 mozilla/mailnews/compose/src/nsMsgI18N.cpp              | 1 -
 mozilla/mailnews/compose/src/nsMsgI18N.h                | 2 ++
 mozilla/mailnews/compose/src/nsMsgSendPart.cpp          | 1 -
 mozilla/mailnews/compose/src/nsMsgUtils.cpp             | 9 ++++-----
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mozilla/mailnews/compose/src/Makefile.in b/mozilla/mailnews/compose/src/Makefile.in
index 759dd2c9bde..83676d73d5c 100644
--- a/mozilla/mailnews/compose/src/Makefile.in
+++ b/mozilla/mailnews/compose/src/Makefile.in
@@ -42,6 +42,7 @@ EXPORTS = \
 	nsMsgI18N.h \
 	nsMsgAttachmentHandler.h \
 	nsMsgPrompts.h \
+	nsMsgTransition.h \
 	$(NULL)
 
 CPPSRCS = \
diff --git a/mozilla/mailnews/compose/src/msgCompGlue.cpp b/mozilla/mailnews/compose/src/msgCompGlue.cpp
index 25230fa6a5f..63e688b420a 100644
--- a/mozilla/mailnews/compose/src/msgCompGlue.cpp
+++ b/mozilla/mailnews/compose/src/msgCompGlue.cpp
@@ -11,7 +11,8 @@
 #include "nsIMimeConverter.h"
 #include "msgCore.h"
 #include "rosetta_mailnews.h"
-#include "nsMsgCompose.h"
+
+#include "msgCompGlue.h"
 
 static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
 static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
diff --git a/mozilla/mailnews/compose/src/nsMsgAttachmentHandler.cpp b/mozilla/mailnews/compose/src/nsMsgAttachmentHandler.cpp
index 59085ba145a..28cc5021009 100644
--- a/mozilla/mailnews/compose/src/nsMsgAttachmentHandler.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgAttachmentHandler.cpp
@@ -22,7 +22,6 @@
 #include "nsMsgSend.h"
 #include "nsMsgUtils.h"
 #include "nsIPref.h"
-#include "nsMsgCompose.h"
 #include "nsMsgEncoders.h"
 #include "nsMsgI18N.h"
 
diff --git a/mozilla/mailnews/compose/src/nsMsgI18N.cpp b/mozilla/mailnews/compose/src/nsMsgI18N.cpp
index 4ce4a29c477..104d8c0f04d 100644
--- a/mozilla/mailnews/compose/src/nsMsgI18N.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgI18N.cpp
@@ -22,7 +22,6 @@
 #include "nsIMimeConverter.h"
 #include "msgCore.h"
 #include "rosetta_mailnews.h"
-#include "nsMsgCompose.h"
 #include "nsMsgI18N.h"
 
 static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
diff --git a/mozilla/mailnews/compose/src/nsMsgI18N.h b/mozilla/mailnews/compose/src/nsMsgI18N.h
index d8830d5daac..1b6a7c28751 100644
--- a/mozilla/mailnews/compose/src/nsMsgI18N.h
+++ b/mozilla/mailnews/compose/src/nsMsgI18N.h
@@ -19,6 +19,8 @@
 #ifndef _nsMsgI18N_H_
 #define _nsMsgI18N_H_
 
+#include "nsMsgTransition.h"
+
 NS_BEGIN_EXTERN_C
 
 char      *nsMsgI18NEncodeMimePartIIStr(const char *header, const char *charset, PRBool bUseMime);
diff --git a/mozilla/mailnews/compose/src/nsMsgSendPart.cpp b/mozilla/mailnews/compose/src/nsMsgSendPart.cpp
index d0d6e15482e..c1f3389a264 100644
--- a/mozilla/mailnews/compose/src/nsMsgSendPart.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgSendPart.cpp
@@ -17,7 +17,6 @@
  */
 #include "rosetta_mailnews.h"
 #include "nsMsgLocalFolderHdrs.h"
-#include "nsMsgCompose.h"
 #include "nsMsgSend.h"
 #include "nsMsgSendPart.h"
 #include "nsIMimeConverter.h"
diff --git a/mozilla/mailnews/compose/src/nsMsgUtils.cpp b/mozilla/mailnews/compose/src/nsMsgUtils.cpp
index e110cbee3bb..8b24a014619 100644
--- a/mozilla/mailnews/compose/src/nsMsgUtils.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgUtils.cpp
@@ -21,7 +21,6 @@
 #include "prmem.h"
 #include "nsMsgSend.h"
 #include "nsINetService.h"
-#include "nsMsgCompose.h"
 #include "nsMailHeaders.h"
 #include "nsMsgI18N.h"
 #include "xp_time.h"
@@ -522,16 +521,16 @@ mime_generate_headers (nsMsgCompFields *fields,
 		else
 		  PUSH_STRING("uuencode=0");
 
-		htmlAction = PR_smprintf("html=%d", 
-		  ((nsMsgCompose*)fields->GetOwner())->GetHTMLAction());
+// RICHIE		htmlAction = PR_smprintf("html=%d", 
+// RICHIE		  ((nsMsgCompose*)fields->GetOwner())->GetHTMLAction());
 		if (htmlAction) {
 			PUSH_STRING("; ");
 			PUSH_STRING(htmlAction);
 			PR_FREEIF(htmlAction);
 		}
 
-		lineWidth = PR_smprintf("; linewidth=%d",
-		  ((nsMsgCompose*)fields->GetOwner())->GetLineWidth());
+// RICHIE		lineWidth = PR_smprintf("; linewidth=%d",
+// RICHIE		  ((nsMsgCompose*)fields->GetOwner())->GetLineWidth());
 		if (lineWidth) {
 			PUSH_STRING(lineWidth);
 			PR_FREEIF(lineWidth);