From 6189743d0d12f8edf0fccd899d0df241cbfa1750 Mon Sep 17 00:00:00 2001 From: "rhp%netscape.com" Date: Sun, 6 Jun 1999 13:28:30 +0000 Subject: [PATCH] forgot to use the propertyURL for as the resource URL git-svn-id: svn://10.0.0.236/trunk@33957 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/mime/src/mimemoz2.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mozilla/mailnews/mime/src/mimemoz2.cpp b/mozilla/mailnews/mime/src/mimemoz2.cpp index 13313c3f604..5e2adea976a 100644 --- a/mozilla/mailnews/mime/src/mimemoz2.cpp +++ b/mozilla/mailnews/mime/src/mimemoz2.cpp @@ -1405,10 +1405,7 @@ MimeGetStringByIDREAL(PRInt32 stringID) res = prefs->CopyCharPref("mail.strings.mime", &propertyURL); if (!NS_SUCCEEDED(res) || !prefs) - propertyURL = PL_strdup(MIME_URL); - - // nobody seems to be using propertyURL, so I'm freeing it again! - PL_strfree(propertyURL); + propertyURL = MIME_URL; NS_WITH_SERVICE(nsINetService, pNetService, kNetServiceCID, &res); if (!NS_SUCCEEDED(res) || (nsnull == pNetService)) @@ -1422,7 +1419,11 @@ MimeGetStringByIDREAL(PRInt32 stringID) nsIURL *url = nsnull; nsILocale *locale = nsnull; - res = pNetService->CreateURL(&url, nsString(MIME_URL), nsnull, nsnull, nsnull); + res = pNetService->CreateURL(&url, nsString(propertyURL), nsnull, nsnull, nsnull); + // Cleanup property URL + if (propertyURL != MIME_URL) + PR_FREEIF(propertyURL); + if (NS_FAILED(res)) { return PL_strdup("???"); // Don't I18N this string...failsafe return value