Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove static constructors from nsRelatedLinksHandler. r=disttsc@bart.nl sr=brendan@mozilla.org b=67314

Browse Source
This commit is contained in:
dbaron%fas.harvard.edu 2001-02-18 17:07:19 +00:00
parent 0ec8f2875d
commit e0e16ecbf4
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xpfe/components/related/src/nsRelatedLinksHandler.cpp
View File

@ -62,8 +62,8 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static const char kURINC_RelatedLinksRoot[] = "NC:RelatedLinks";
nsString RelatedLinksHandlerImpl::mRLServerURL;
PRInt32 RelatedLinksHandlerImpl::gRefCnt;
nsString *RelatedLinksHandlerImpl::mRLServerURL = nsnull;
PRInt32 RelatedLinksHandlerImpl::gRefCnt = 0;
nsIRDFService *RelatedLinksHandlerImpl::gRDFService;
nsIRDFResource *RelatedLinksHandlerImpl::kNC_RelatedLinksRoot;
nsIRDFResource *RelatedLinksHandlerImpl::kNC_Child;
@ -590,6 +590,9 @@ RelatedLinksHandlerImpl::~RelatedLinksHandlerImpl()
if (--gRefCnt == 0)
{
delete mRLServerURL;
mRLServerURL = nsnull;
NS_IF_RELEASE(kNC_RelatedLinksRoot);
NS_IF_RELEASE(kRDF_type);
NS_IF_RELEASE(kNC_RelatedLinksTopic);
@ -620,20 +623,21 @@ RelatedLinksHandlerImpl::Init()
gRDFService->GetResource(NC_NAMESPACE_URI "child", &kNC_Child);
NS_WITH_SERVICE(nsIPref, prefServ, kPrefCID, &rv);
mRLServerURL = new nsString();
if (NS_SUCCEEDED(rv) && (prefServ))
{
char *prefVal = nsnull;
if (NS_SUCCEEDED(rv = prefServ->CopyCharPref("browser.related.provider",
&prefVal)) && (prefVal))
{
mRLServerURL.AssignWithConversion(prefVal);
mRLServerURL->AssignWithConversion(prefVal);
nsCRT::free(prefVal);
prefVal = nsnull;
}
else
{
// no preference, so fallback to a well-known URL
mRLServerURL.AssignWithConversion("http://www-rl.netscape.com/wtgn?");
mRLServerURL->Assign(NS_LITERAL_STRING("http://www-rl.netscape.com/wtgn?"));
}
}
}
@ -696,7 +700,7 @@ RelatedLinksHandlerImpl::SetURL(const char* aURL)
rv = purgeable->Sweep();
if (NS_FAILED(rv)) return rv;
nsAutoString relatedLinksQueryURL(mRLServerURL);
nsAutoString relatedLinksQueryURL(*mRLServerURL);
relatedLinksQueryURL.AppendWithConversion(mRelatedLinksURL);
nsCOMPtr<nsIURI> url;

4
xpfe/components/related/src/nsRelatedLinksHandlerImpl.h
View File

@ -1,4 +1,4 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
@ -38,7 +38,7 @@ class RelatedLinksHandlerImpl : public nsIRelatedLinksHandler,
{
private:
char *mRelatedLinksURL;
static nsString mRLServerURL;
static nsString *mRLServerURL;
// pseudo-constants
static PRInt32 gRefCnt;