Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 20:22:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes for emitter rework for printing - r: jefft

Browse Source
This commit is contained in:
rhp%netscape.com 1999-12-08 03:34:32 +00:00
parent ed725966ce
commit 0dbd32e463
15 changed files with 32 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mailnews/mime/emitters/resources/skin/MANIFEST
View File

@ -20,6 +20,7 @@
# This is a list of local files which get copied to the res\mailnews\messenger directory
#
mailheader.css
mailheader-micro.css
mailheader-normal.css
mailheader-all.css

1
mailnews/mime/emitters/resources/skin/Makefile.in
View File

@ -27,6 +27,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXPORT_RESOURCES = \
$(srcdir)/mailheader.css \
$(srcdir)/mailheader-micro.css \
$(srcdir)/mailheader-normal.css \
$(srcdir)/mailheader-all.css \

21
mailnews/mime/emitters/resources/skin/mailheader-all.css
View File

@ -1,23 +1,6 @@
/*
* Window behavior for scrolling and general header color
* attributes
*/
window { overflow: auto; }
mailheader { display: block; }
mailattachcount { display: none; }
box[name=header-attachment] { background-color: #EFEFEF; border: 0px solid #EFEFEF; border-left-width: 4px; }
box[name=header-part1] { background-color: #EFEFEF; border: 0px solid #EFEFEF; border-left-width: 4px; }
box[name=header-part2] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
box[name=header-part3] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
box[name=header-seamonkey] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
menubar[name=attachment-menubar] { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
menu[name=attachment-menu] { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
/**************************************************
* These are all the headers that are displayed
* for the normal header display. This is accomplished
* for the ALL header display. This is accomplished
* by having a general header tag that turns off the
* display of the field and then we selectively turn
* on header displays. This will prevent unknown headers
@ -47,7 +30,7 @@ header[field=USER-AGENT] { display: block; text-align:left; }
/**************************************************
* These are all the headers that are NOT displayed
* for the normal header display
* for the ALL header display
**************************************************/
/*
* All misc headers (i.e. the ones that start with

21
mailnews/mime/emitters/resources/skin/mailheader-micro.css
View File

@ -1,23 +1,6 @@
/*
* Window behavior for scrolling and general header color
* attributes
*/
window { overflow: auto; }
mailheader { display: block; }
mailattachcount { display: none; }
box[name=header-attachment] { background-color: #EFEFEF; border: 0px solid #EFEFEF; border-left-width: 4px; }
box[name=header-part1] { background-color: #EFEFEF; border: 0px solid #EFEFEF; border-left-width: 4px; }
box[name=header-part2] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
box[name=header-part3] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
box[name=header-seamonkey] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
menubar[name=attachment-menubar] { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
menu[name=attachment-menu] { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
/**************************************************
* These are all the headers that are displayed
* for the normal header display. This is accomplished
* for the micro header display. This is accomplished
* by having a general header tag that turns off the
* display of the field and then we selectively turn
* on header displays. This will prevent unknown headers
@ -47,7 +30,7 @@ header[field=USER-AGENT] { display: block; text-align:left; }
/**************************************************
* These are all the headers that are NOT displayed
* for the normal header display
* for the micro header display
**************************************************/
/*
* All misc headers (i.e. the ones that start with

17
mailnews/mime/emitters/resources/skin/mailheader-normal.css
View File

@ -1,20 +1,3 @@
/*
* Window behavior for scrolling and general header color
* attributes
*/
window { overflow: auto; }
mailheader { display: block; }
mailattachcount { display: none; }
box[name=header-attachment] { background-color: #EFEFEF; border: 0px solid #EFEFEF; border-left-width: 4px; }
box[name=header-part1] { background-color: #EFEFEF; border: 0px solid #EFEFEF; border-left-width: 4px; }
box[name=header-part2] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
box[name=header-part3] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
box[name=header-seamonkey] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
menubar[name=attachment-menubar] { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
menu[name=attachment-menu] { background-color: #EFEFEF; border: 0px solid #EFEFEF; }
/**************************************************
* These are all the headers that are displayed
* for the normal header display. This is accomplished

2
mailnews/mime/emitters/resources/skin/makefile.win
View File

@ -25,6 +25,7 @@ DEFINES=-DWIN32_LEAN_AND_MEAN
include <$(DEPTH)\config\rules.mak>
install::
$(MAKE_INSTALL) mailheader.css $(DIST)\bin\chrome\messenger\skin\default
$(MAKE_INSTALL) mailheader-micro.css $(DIST)\bin\chrome\messenger\skin\default
$(MAKE_INSTALL) mailheader-normal.css $(DIST)\bin\chrome\messenger\skin\default
$(MAKE_INSTALL) mailheader-all.css $(DIST)\bin\chrome\messenger\skin\default
@ -32,6 +33,7 @@ install::
$(MAKE_INSTALL) attach.gif $(DIST)\bin\chrome\messenger\skin\default
clobber::
rm -f $(DIST)\bin\chrome\messenger\skin\default\mailheader.css
rm -f $(DIST)\bin\chrome\messenger\skin\default\mailheader-micro.css
rm -f $(DIST)\bin\chrome\messenger\skin\default\mailheader-normal.css
rm -f $(DIST)\bin\chrome\messenger\skin\default\mailheader-all.css

57
mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp
View File

@ -47,15 +47,10 @@ nsMimeBaseEmitter::nsMimeBaseEmitter()
{
NS_INIT_REFCNT();
#ifdef DEBUG_rhp
mLogFile = nsnull;
#endif
mBufferMgr = NULL;
mTotalWritten = 0;
mTotalRead = 0;
mDocHeader = PR_FALSE;
mAttachContentType = NULL;
m_stringBundle = nsnull;
mInputStream = nsnull;
@ -123,10 +118,6 @@ nsMimeBaseEmitter::SetOutputListener(nsIStreamListener *listener)
NS_IMETHODIMP
nsMimeBaseEmitter::Complete()
{
#ifdef DEBUG_rhp
mReallyOutput = PR_FALSE;
#endif
// If we are here and still have data to write, we should try
// to flush it...if we try and fail, we should probably return
// an error!
@ -141,11 +132,6 @@ nsMimeBaseEmitter::Complete()
mOutListener->OnDataAvailable(mChannel, mURL, mInputStream, 0, bytesInStream);
}
#ifdef DEBUG_rhp
if (mLogFile)
PR_Close(mLogFile);
#endif
return NS_OK;
}
@ -154,30 +140,18 @@ NS_IMETHODIMP
nsMimeBaseEmitter::StartHeader(PRBool rootMailHeader, PRBool headerOnly, const char *msgID,
const char *outCharset)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
return NS_OK;
}
NS_IMETHODIMP
nsMimeBaseEmitter::AddHeaderField(const char *field, const char *value)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
return NS_OK;
}
NS_IMETHODIMP
nsMimeBaseEmitter::EndHeader()
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
return NS_OK;
}
@ -185,29 +159,18 @@ nsMimeBaseEmitter::EndHeader()
NS_IMETHODIMP
nsMimeBaseEmitter::StartAttachment(const char *name, const char *contentType, const char *url)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
return NS_OK;
}
NS_IMETHODIMP
nsMimeBaseEmitter::AddAttachmentField(const char *field, const char *value)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
return NS_OK;
}
NS_IMETHODIMP
nsMimeBaseEmitter::EndAttachment()
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
return NS_OK;
}
@ -215,10 +178,6 @@ nsMimeBaseEmitter::EndAttachment()
NS_IMETHODIMP
nsMimeBaseEmitter::StartBody(PRBool bodyOnly, const char *msgID, const char *outCharset)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
return NS_OK;
}
@ -226,19 +185,12 @@ nsMimeBaseEmitter::StartBody(PRBool bodyOnly, const char *msgID, const char *out
NS_IMETHODIMP
nsMimeBaseEmitter::WriteBody(const char *buf, PRUint32 size, PRUint32 *amountWritten)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
return NS_OK;
}
NS_IMETHODIMP
nsMimeBaseEmitter::EndBody()
{
#ifdef DEBUG_rhp
mReallyOutput = PR_FALSE;
#endif
return NS_OK;
}
@ -277,11 +229,6 @@ nsMimeBaseEmitter::Write(const char *buf, PRUint32 size, PRUint32 *amountWritten
PRUint32 rc = 0;
PRUint32 needToWrite;
#ifdef DEBUG_rhp
if ((mLogFile) && (mReallyOutput))
PR_Write(mLogFile, buf, size);
#endif
//
// Make sure that the buffer we are "pushing" into has enough room
// for the write operation. If not, we have to buffer, return, and get
@ -298,7 +245,6 @@ nsMimeBaseEmitter::Write(const char *buf, PRUint32 size, PRUint32 *amountWritten
mTotalWritten += written;
mBufferMgr->ReduceBuffer(written);
// mOutListener->OnDataAvailable(mChannel, mURL, mInputStream, 0, written);
*amountWritten = written;
// if we couldn't write all the old data, buffer the new data
@ -320,9 +266,6 @@ nsMimeBaseEmitter::Write(const char *buf, PRUint32 size, PRUint32 *amountWritten
if (written < size)
mBufferMgr->IncreaseBuffer(buf+written, (size-written));
// if (mOutListener)
// mOutListener->OnDataAvailable(mChannel, mURL, mInputStream, 0, written);
return rc;
}

7
mailnews/mime/emitters/src/nsMimeBaseEmitter.h
View File

@ -76,19 +76,12 @@ protected:
// For header determination...
PRBool mDocHeader;
// For content type...
char *mAttachContentType;
// the url for the data being processed...
nsIURI *mURL;
// The setting for header output...
nsIPref *mPrefs; /* Connnection to prefs service manager */
PRInt32 mHeaderDisplayType;
#ifdef DEBUG_rhp
PRBool mReallyOutput;
PRFileDesc *mLogFile; /* Temp file to put generated HTML into. */
#endif
};
#endif /* _nsMimeBaseEmitter_h_ */

171
mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp
View File

@ -54,37 +54,20 @@ nsresult
nsMimeHtmlEmitter::StartHeader(PRBool rootMailHeader, PRBool headerOnly, const char *msgID,
const char *outCharset)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
mDocHeader = rootMailHeader;
if (mDocHeader)
{
if ( (!headerOnly) && (outCharset) && (*outCharset) )
{
#ifdef NS_DEBUG
printf("RICHIE: libmime: Not Emitting META Tags!\n");
#endif
// UtilityWrite("<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=");
// UtilityWrite(outCharset);
// UtilityWrite("\">");
}
UtilityWrite("<BLOCKQUOTE><table BORDER=0>");
UtilityWrite("<TABLE BORDER=0>");
}
else
UtilityWrite("<BLOCKQUOTE><table BORDER=0 BGCOLOR=\"#CCCCCC\" >");
UtilityWrite("<TABLE BORDER=0>");
return NS_OK;
}
nsresult
nsMimeHtmlEmitter::AddHeaderField(const char *field, const char *value)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
if ( (!field) || (!value) )
return NS_OK;
@ -101,8 +84,8 @@ nsMimeHtmlEmitter::AddHeaderField(const char *field, const char *value)
UtilityWrite("<TR>");
UtilityWrite("<td>");
UtilityWrite("<div align=right>");
UtilityWrite("<TD>");
UtilityWrite("<DIV align=right>");
UtilityWrite("<B>");
// Here is where we are going to try to L10N the tagName so we will always
@ -127,12 +110,12 @@ nsMimeHtmlEmitter::AddHeaderField(const char *field, const char *value)
//
UtilityWrite(":");
UtilityWrite("</B>");
UtilityWrite("</div>");
UtilityWrite("</td>");
UtilityWrite("</DIV>");
UtilityWrite("</TD>");
UtilityWrite("<td>");
UtilityWrite("<TD>");
UtilityWrite(newValue);
UtilityWrite("</td>");
UtilityWrite("</TD>");
UtilityWrite("</TR>");
@ -144,48 +127,10 @@ nsMimeHtmlEmitter::AddHeaderField(const char *field, const char *value)
nsresult
nsMimeHtmlEmitter::EndHeader()
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
UtilityWrite("</TABLE></BLOCKQUOTE>");
return NS_OK;
}
nsresult
nsMimeHtmlEmitter::ProcessContentType(const char *ct)
{
if (mAttachContentType)
{
PR_FREEIF(mAttachContentType);
mAttachContentType = NULL;
}
if ( (!ct) || (!*ct) )
return NS_OK;
char *slash = PL_strchr(ct, '/');
if (!slash)
mAttachContentType = nsCRT::strdup(ct);
else
{
PRInt32 size = (nsCRT::strlen(ct) + 4 + 1);
mAttachContentType = (char *)PR_MALLOC( size );
if (!mAttachContentType)
return NS_ERROR_OUT_OF_MEMORY;
memset(mAttachContentType, 0, size);
PL_strcpy(mAttachContentType, ct);
char *newSlash = PL_strchr(mAttachContentType, '/');
*newSlash = '\0';
PL_strcat(mAttachContentType, "%2F");
PL_strcat(mAttachContentType, (slash + 1));
}
return NS_OK;
}
// Attachment handling routines
// Ok, we are changing the way we handle these now...It used to be that we output
// HTML to make a clickable link, etc... but now, this should just be informational
@ -194,96 +139,46 @@ nsMimeHtmlEmitter::ProcessContentType(const char *ct)
nsresult
nsMimeHtmlEmitter::StartAttachment(const char *name, const char *contentType, const char *url)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
PR_FREEIF(mAttachContentType);
mAttachContentType = NULL;
ProcessContentType(contentType);
UtilityWrite("<CENTER>");
UtilityWrite("<table BORDER CELLSPACING=0>");
UtilityWrite("<TABLE BORDER CELLSPACING=0>");
UtilityWrite("<tr>");
UtilityWrite("<td>");
/** RICHIE Not doing a link anymore...
if (mAttachContentType)
{
UtilityWrite("<a href=\"");
UtilityWrite(url);
UtilityWrite("&outformat=");
UtilityWrite(mAttachContentType);
UtilityWrite("\" target=new>");
}
***/
UtilityWrite("<TD>");
UtilityWrite("<CENTER>");
UtilityWrite("<B>Attachment: </B>");
UtilityWrite(name);
UtilityWrite("</CENTER>");
/***
if (mAttachContentType)
UtilityWrite("</a>");
****/
UtilityWrite("</td>");
UtilityWrite("<td>");
UtilityWrite("<table BORDER=0>");
UtilityWrite("</TD>");
UtilityWrite("<TD>");
UtilityWrite("<TABLE BORDER=0>");
return NS_OK;
}
nsresult
nsMimeHtmlEmitter::AddAttachmentField(const char *field, const char *value)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
// Don't let bad things happen
if ( (!value) || (!*value) )
return NS_OK;
char *newValue = nsEscapeHTML(value);
PRBool linkIt = (!nsCRT::strcmp(HEADER_X_MOZILLA_PART_URL, field));
//
// For now, let's not output the long URL field, but when prefs are
// working this will change.
//
if (linkIt)
return NS_OK;
UtilityWrite("<TR>");
UtilityWrite("<td>");
UtilityWrite("<div align=right>");
UtilityWrite("<TD>");
UtilityWrite("<DIV align=right>");
UtilityWrite("<B>");
UtilityWrite(field);
UtilityWrite(":");
UtilityWrite("</B>");
UtilityWrite("</div>");
UtilityWrite("</td>");
UtilityWrite("<td>");
if (linkIt)
{
UtilityWrite("<a href=\"");
UtilityWrite(value);
if (mAttachContentType)
{
UtilityWrite("&outformat=");
UtilityWrite(mAttachContentType);
}
UtilityWrite("\" target=new>");
}
UtilityWrite("</DIV>");
UtilityWrite("</TD>");
UtilityWrite("<TD>");
UtilityWrite(newValue);
if (linkIt)
UtilityWrite("</a>");
UtilityWrite("</td>");
UtilityWrite("</TD>");
UtilityWrite("</TR>");
PR_FREEIF(newValue);
@ -293,13 +188,8 @@ nsMimeHtmlEmitter::AddAttachmentField(const char *field, const char *value)
nsresult
nsMimeHtmlEmitter::EndAttachment()
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
PR_FREEIF(mAttachContentType);
UtilityWrite("</TABLE>");
UtilityWrite("</td>");
UtilityWrite("</TD>");
UtilityWrite("</tr>");
UtilityWrite("</TABLE>");
@ -312,33 +202,12 @@ nsMimeHtmlEmitter::EndAttachment()
nsresult
nsMimeHtmlEmitter::StartBody(PRBool bodyOnly, const char *msgID, const char *outCharset)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
if ((bodyOnly) && (outCharset) && (*outCharset))
{
#ifdef NS_DEBUG
printf("RICHIE: libmime: Not Emitting META Tags!\n");
#endif
// UtilityWrite("<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=");
// UtilityWrite(outCharset);
// UtilityWrite("\">");
}
return NS_OK;
}
nsresult
nsMimeHtmlEmitter::WriteBody(const char *buf, PRUint32 size, PRUint32 *amountWritten)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
Write(buf, size, amountWritten);
return NS_OK;
}

7
mailnews/mime/emitters/src/nsMimeHtmlEmitter.h
View File

@ -53,13 +53,6 @@ public:
NS_IMETHOD StartBody(PRBool bodyOnly, const char *msgID, const char *outCharset);
NS_IMETHOD WriteBody(const char *buf, PRUint32 size, PRUint32 *amountWritten);
// Generic write routine. This is necessary for output that
// libmime needs to pass through without any particular parsing
// involved (i.e. decoded images, HTML Body Text, etc...
// NS_IMETHOD Write(const char *buf, PRUint32 size, PRUint32 *amountWritten);
NS_IMETHOD ProcessContentType(const char *ct);
protected:
};

4
mailnews/mime/emitters/src/nsMimeRawEmitter.cpp
View File

@ -55,10 +55,6 @@ nsMimeRawEmitter::~nsMimeRawEmitter(void)
NS_IMETHODIMP
nsMimeRawEmitter::WriteBody(const char *buf, PRUint32 size, PRUint32 *amountWritten)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
Write(buf, size, amountWritten);
return NS_OK;
}

9
mailnews/mime/emitters/src/nsMimeXULEmitter.cpp
View File

@ -373,6 +373,7 @@ nsMimeXULEmitter::WriteXULHeader(const char *msgID)
UtilityWriteCRLF("<?xml version=\"1.0\"?>");
UtilityWriteCRLF("<?xml-stylesheet href=\"chrome://messenger/skin/mailheader.css\" type=\"text/css\"?>");
if (mHeaderDisplayType == nsMimeHeaderDisplayTypes::MicroHeaders)
UtilityWriteCRLF("<?xml-stylesheet href=\"chrome://messenger/skin/mailheader-micro.css\" type=\"text/css\"?>");
else if (mHeaderDisplayType == nsMimeHeaderDisplayTypes::NormalHeaders)
@ -1270,7 +1271,6 @@ nsMimeXULEmitter::Write(const char *buf, PRUint32 size, PRUint32 *amountWritten)
PRUint32 rc = 0;
PRUint32 needToWrite;
// *m_outputFile << buf;
//
// Make sure that the buffer we are "pushing" into has enough room
// for the write operation. If not, we have to buffer, return, and get
@ -1286,7 +1286,6 @@ nsMimeXULEmitter::Write(const char *buf, PRUint32 size, PRUint32 *amountWritten)
needToWrite, &written);
mTotalWritten += written;
mBufferMgr->ReduceBuffer(written);
// mOutListener->OnDataAvailable(mChannel, mURL, mInputStream, 0, written);
*amountWritten = written;
@ -1320,11 +1319,5 @@ nsMimeXULEmitter::Write(const char *buf, PRUint32 size, PRUint32 *amountWritten)
if (written < size)
mBufferMgr->IncreaseBuffer(buf+written, (size-written));
// Only call the listener if we wrote data into the stream.
// if ((!mBodyStarted) && (mOutListener))
//mOutListener->OnDataAvailable(mChannel, mURL, mInputStream, 0, written);
return rc;
}

1
mailnews/mime/emitters/src/nsMimeXULEmitter.h
View File

@ -127,7 +127,6 @@ protected:
// For header caching...
nsVoidArray *mHeaderArray;
// RICHIE SHERRY nsCOMPtr<nsIMimeMiscStatus> mMiscStatus;
nsVoidArray *mMiscStatusArray;
nsCOMPtr<nsIMsgHeaderParser> mHeaderParser;
};

28
mailnews/mime/emitters/src/nsMimeXmlEmitter.cpp
View File

@ -59,10 +59,6 @@ nsMimeXmlEmitter::~nsMimeXmlEmitter(void)
nsresult
nsMimeXmlEmitter::Complete()
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
char buf[16];
// Now write out the total count of attachments for this message
@ -89,6 +85,7 @@ nsMimeXmlEmitter::WriteXMLHeader(const char *msgID)
UtilityWrite("<?xml version=\"1.0\"?>");
UtilityWriteCRLF("<?xml-stylesheet href=\"chrome://messenger/skin/mailheader.css\" type=\"text/css\"?>");
if (mHeaderDisplayType == nsMimeHeaderDisplayTypes::MicroHeaders)
UtilityWrite("<?xml-stylesheet href=\"chrome://messenger/skin/mailheader-micro.css\" type=\"text/css\"?>");
else if (mHeaderDisplayType == nsMimeHeaderDisplayTypes::NormalHeaders)
@ -159,10 +156,6 @@ nsresult
nsMimeXmlEmitter::StartHeader(PRBool rootMailHeader, PRBool headerOnly, const char *msgID,
const char *outCharset)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
mDocHeader = rootMailHeader;
WriteXMLHeader(msgID);
UtilityWrite("<mailheader>");
@ -173,10 +166,6 @@ nsMimeXmlEmitter::StartHeader(PRBool rootMailHeader, PRBool headerOnly, const ch
nsresult
nsMimeXmlEmitter::AddHeaderField(const char *field, const char *value)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
if ( (!field) || (!value) )
return NS_OK;
@ -187,10 +176,6 @@ nsMimeXmlEmitter::AddHeaderField(const char *field, const char *value)
nsresult
nsMimeXmlEmitter::EndHeader()
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
UtilityWrite("</mailheader>");
return NS_OK;
}
@ -201,9 +186,6 @@ nsresult
nsMimeXmlEmitter::StartAttachment(const char *name, const char *contentType, const char *url)
{
char buf[128];
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
++mAttachCount;
@ -217,10 +199,6 @@ nsMimeXmlEmitter::StartAttachment(const char *name, const char *contentType, con
nsresult
nsMimeXmlEmitter::AddAttachmentField(const char *field, const char *value)
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
WriteXMLTag(field, value);
return NS_OK;
}
@ -228,10 +206,6 @@ nsMimeXmlEmitter::AddAttachmentField(const char *field, const char *value)
nsresult
nsMimeXmlEmitter::EndAttachment()
{
#ifdef DEBUG_rhp
mReallyOutput = PR_TRUE;
#endif
UtilityWrite("</mailattachment>");
return NS_OK;
}

3
mailnews/mime/public/nsIMimeStreamConverter.idl
View File

@ -46,7 +46,8 @@ interface nsMimeOutput
const long nsMimeMessageDraftOrTemplate = 6;
const long nsMimeMessageEditorTemplate = 7;
const long nsMimeMessageXULDisplay = 8;
const long nsMimeUnknown = 9;
const long nsMimeMessagePrintOutput = 9;
const long nsMimeUnknown = 10;
};
[scriptable, uuid(FA81CAA0-6261-11d3-8311-00805F2A0107)]