From 32b4eebc68cdbef7e374078db327005f1149d229 Mon Sep 17 00:00:00 2001 From: "nhotta%netscape.com" Date: Sat, 6 May 2000 01:33:31 +0000 Subject: [PATCH] Changed to specify content type explicitly for GetMailNewFont(). git-svn-id: svn://10.0.0.236/trunk@68483 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/mime/src/mimemoz2.cpp | 6 +++--- mozilla/mailnews/mime/src/mimemoz2.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/mailnews/mime/src/mimemoz2.cpp b/mozilla/mailnews/mime/src/mimemoz2.cpp index 921e759fdcd..abab23ecc55 100644 --- a/mozilla/mailnews/mime/src/mimemoz2.cpp +++ b/mozilla/mailnews/mime/src/mimemoz2.cpp @@ -1962,15 +1962,15 @@ int EndMailNewsFont(MimeObject *obj) } // TODO: rewrite BeginMailNewFont to use this. -nsresult GetMailNewsFont(MimeObject *obj, char *fontName, PRInt32 *fontSize) +nsresult GetMailNewsFont(MimeObject *obj, const char *contentType, char *fontName, PRInt32 *fontSize) { nsresult rv = NS_OK; // check Content-Type: PRBool bTEXT_HTML = PR_FALSE; - if (!nsCRT::strcasecmp(obj->content_type, TEXT_HTML)) + if (!nsCRT::strcasecmp(contentType, TEXT_HTML)) bTEXT_HTML = PR_TRUE; - else if (nsCRT::strcasecmp(obj->content_type, TEXT_PLAIN)) + else if (nsCRT::strcasecmp(contentType, TEXT_PLAIN)) return NS_ERROR_FAILURE; // not supported type nsIPref *aPrefs = GetPrefServiceManager(obj->options); diff --git a/mozilla/mailnews/mime/src/mimemoz2.h b/mozilla/mailnews/mime/src/mimemoz2.h index 9355503d03c..b619341b2ea 100644 --- a/mozilla/mailnews/mime/src/mimemoz2.h +++ b/mozilla/mailnews/mime/src/mimemoz2.h @@ -164,7 +164,7 @@ extern "C" nsresult nsMimeNewURI(nsIURI** aInstancePtrResult, const char extern "C" int BeginMailNewsFont(MimeObject *obj); extern "C" int EndMailNewsFont(MimeObject *obj); -extern "C" nsresult GetMailNewsFont(MimeObject *obj, char *fontName, PRInt32 *fontSize); +extern "C" nsresult GetMailNewsFont(MimeObject *obj, const char *contentType, char *fontName, PRInt32 *fontSize); #ifdef __cplusplus }