Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug #108965 --> remove xul emitter from the build

Browse Source 
r=ducarroz
sr=sspitzer
This commit is contained in:
mscott%netscape.com 2002-01-25 05:18:17 +00:00
parent 884be956c1
commit 8c9ffc4606
5 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mailnews/mime/emitters/build/nsEmitterFactory.cpp
View File

@ -51,11 +51,9 @@
#include "nsMimeHtmlEmitter.h"
#include "nsMimeRawEmitter.h"
#include "nsMimeXmlEmitter.h"
#include "nsMimeXULEmitter.h"
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMimeRawEmitter);
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMimeXmlEmitter);
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMimeXULEmitter);
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMimeHtmlDisplayEmitter, Init);
@ -102,13 +100,6 @@ static nsModuleComponentInfo components[] =
nsMimeRawEmitterConstructor,
RegisterMimeEmitter,
UnRegisterMimeEmitter
},
{ "XUL MIME Emitter",
NS_XUL_MIME_EMITTER_CID,
NS_XUL_MIME_EMITTER_CONTRACTID,
nsMimeXULEmitterConstructor,
RegisterMimeEmitter,
UnRegisterMimeEmitter
}
};

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

@ -752,10 +752,7 @@ nsMimeBaseEmitter::WriteHTMLHeaders()
// Now, we need to either append the headers we built up to the
// overall body or output to the stream.
if ( (!mDocHeader) && (mFormat == nsMimeOutput::nsMimeMessageXULDisplay) )
mBody.Append(mHTMLHeaders);
else
UtilityWriteCRLF(mHTMLHeaders.get());
UtilityWriteCRLF(mHTMLHeaders.get());
mHTMLHeaders = "";

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

@ -61,7 +61,6 @@ interface nsMimeOutput
const long nsMimeMessageRaw = 5;
const long nsMimeMessageDraftOrTemplate = 6;
const long nsMimeMessageEditorTemplate = 7;
const long nsMimeMessageXULDisplay = 8;
const long nsMimeMessagePrintOutput = 9;
const long nsMimeMessageSaveAs = 10;
const long nsMimeMessageSource = 11;

1
mailnews/mime/src/mimemoz2.cpp
View File

@ -1500,7 +1500,6 @@ mime_bridge_create_display_stream(
case nsMimeOutput::nsMimeMessageSplitDisplay: // the wrapper HTML output to produce the split header/body display
case nsMimeOutput::nsMimeMessageHeaderDisplay: // the split header/body display
case nsMimeOutput::nsMimeMessageBodyDisplay: // the split header/body display
case nsMimeOutput::nsMimeMessageXULDisplay:
msd->options->fancy_headers_p = PR_TRUE;
msd->options->output_vcard_buttons_p = PR_TRUE;
msd->options->fancy_links_p = PR_TRUE;

27
mailnews/mime/src/nsStreamConverter.cpp
View File

@ -74,8 +74,6 @@
#define PREF_MAIL_DISPLAY_GLYPH "mail.display_glyph"
#define PREF_MAIL_DISPLAY_STRUCT "mail.display_struct"
#define PREF_MAIL_MIME_XUL_OUTPUT "mail.mime_xul_output"
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
////////////////////////////////////////////////////////////////
@ -446,24 +444,9 @@ nsStreamConverter::DetermineOutputFormat(const char *url, nsMimeOutputType *aNe
}
else
{
// okay, we are just doing a regular message display url
// since we didn't have any special extensions after the url...
// we need to know if we need to use the application/vnd.mozilla.xul+xml
// or text/html emitter.
// check the desired output content type that was passed into AsyncConvertData.
if (mDesiredOutputType && Compare(nsDependentString(mDesiredOutputType), NS_LITERAL_STRING("application/vnd.mozilla.xul+xml"),nsCaseInsensitiveStringComparator()) == 0)
{
CRTFREEIF(mOutputFormat);
mOutputFormat = nsCRT::strdup("application/vnd.mozilla.xul+xml");
*aNewType = nsMimeOutput::nsMimeMessageXULDisplay;
}
else
{
CRTFREEIF(mOutputFormat);
mOutputFormat = nsCRT::strdup("text/html");
*aNewType = nsMimeOutput::nsMimeMessageBodyDisplay;
}
CRTFREEIF(mOutputFormat);
mOutputFormat = nsCRT::strdup("text/html");
*aNewType = nsMimeOutput::nsMimeMessageBodyDisplay;
}
}
else // this is a part that should just come out raw!
@ -596,10 +579,6 @@ NS_IMETHODIMP nsStreamConverter::Init(nsIURI *aURI, nsIStreamListener * aOutList
mOutputType = newType;
switch (newType)
{
case nsMimeOutput::nsMimeMessageXULDisplay:
CRTFREEIF(mOutputFormat);
mOutputFormat = nsCRT::strdup("application/vnd.mozilla.xul+xml");
break;
case nsMimeOutput::nsMimeMessageSplitDisplay: // the wrapper HTML output to produce the split header/body display
mWrapperOutput = PR_TRUE;
CRTFREEIF(mOutputFormat);