Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing build bustage.

Browse Source
This commit is contained in:
hyatt%netscape.com 1999-04-10 09:13:54 +00:00
parent 1cbee2ae05
commit 040008671e
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chrome/src/nsChromeRegistry.cpp
View File

@ -62,7 +62,7 @@ public:
NS_DECL_ISUPPORTS
// nsIChromeRegistry methods:
NS_IMETHOD EnsureRegistryDataSource();
NS_IMETHOD InitRegistry();
NS_IMETHOD ConvertChromeURL(nsIURL* aChromeURL);
// nsIRDFDataSource methods
@ -280,7 +280,7 @@ nsChromeRegistry::ConvertChromeURL(nsIURL* aChromeURL)
}
NS_IMETHODIMP
nsChromeRegistry::EnsureRegistryDataSource()
nsChromeRegistry::InitRegistry()
{
if (mInner == nsnull)
return Init("rdf:chrome");

7
network/module/nsNetService.cpp
View File

@ -229,7 +229,6 @@ nsNetlibService::nsNetlibService()
(nsISupports **)&gChromeRegistry))) {
gChromeRegistry = nsnull;
}
else gChromeRegistry->Init(); // Load the chrome registry
}
}
@ -397,7 +396,8 @@ nsresult nsNetlibService::OpenStream(nsIURL *aUrl,
if ((PL_strcmp(protocol, "chrome") == 0) &&
gChromeRegistry != nsnull) {
if (NS_FAILED(result = gChromeRegistry->ConvertChromeURL(aUrl))) {
if (NS_FAILED(result = gChromeRegistry->InitRegistry()) ||
NS_FAILED(result = gChromeRegistry->ConvertChromeURL(aUrl))) {
NS_ERROR("Unable to convert chrome URL.");
return result;
}
@ -552,7 +552,8 @@ nsresult nsNetlibService::OpenBlockingStream(nsIURL *aUrl,
if ((PL_strcmp(protocol, "chrome") == 0) &&
gChromeRegistry != nsnull) {
if (NS_FAILED(result = gChromeRegistry->ConvertChromeURL(aUrl))) {
if (NS_FAILED(result = gChromeRegistry->InitRegistry()) ||
NS_FAILED(result = gChromeRegistry->ConvertChromeURL(aUrl))) {
NS_ERROR("Unable to convert chrome URL.");
return result;
}

2
rdf/chrome/public/nsIChromeRegistry.h
View File

@ -33,7 +33,7 @@ public:
static const nsIID& GetIID() { static nsIID iid = NS_ICHROMEREGISTRY_IID; return iid; }
NS_IMETHOD ConvertChromeURL(nsIURL* aChromeURL) = 0;
NS_IMETHOD EnsureRegistryDataSource() = 0;
NS_IMETHOD InitRegistry() = 0;
};
// for component registration

4
rdf/chrome/src/nsChromeRegistry.cpp
View File

@ -62,7 +62,7 @@ public:
NS_DECL_ISUPPORTS
// nsIChromeRegistry methods:
NS_IMETHOD EnsureRegistryDataSource();
NS_IMETHOD InitRegistry();
NS_IMETHOD ConvertChromeURL(nsIURL* aChromeURL);
// nsIRDFDataSource methods
@ -280,7 +280,7 @@ nsChromeRegistry::ConvertChromeURL(nsIURL* aChromeURL)
}
NS_IMETHODIMP
nsChromeRegistry::EnsureRegistryDataSource()
nsChromeRegistry::InitRegistry()
{
if (mInner == nsnull)
return Init("rdf:chrome");