Fixes for recent checkins
git-svn-id: svn://10.0.0.236/trunk@34018 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -42,6 +42,7 @@ EXPORTS = \
|
||||
nsMsgI18N.h \
|
||||
nsMsgAttachmentHandler.h \
|
||||
nsMsgPrompts.h \
|
||||
nsMsgTransition.h \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = \
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
#include "nsMsgSend.h"
|
||||
#include "nsMsgUtils.h"
|
||||
#include "nsIPref.h"
|
||||
#include "nsMsgCompose.h"
|
||||
#include "nsMsgEncoders.h"
|
||||
#include "nsMsgI18N.h"
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
*/
|
||||
#include "rosetta_mailnews.h"
|
||||
#include "nsMsgLocalFolderHdrs.h"
|
||||
#include "nsMsgCompose.h"
|
||||
#include "nsMsgSend.h"
|
||||
#include "nsMsgSendPart.h"
|
||||
#include "nsIMimeConverter.h"
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user