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

Bug 46772. Added nsIDirectoryService::UnregisterProvider

Browse Source
This commit is contained in:
warren%netscape.com 2000-09-08 04:57:33 +00:00
parent b77c3c2afa
commit 52514c7ffc
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xpcom/io/nsDirectoryService.cpp
View File

@ -547,13 +547,14 @@ typedef struct FileData
static PRBool FindProviderFile(nsISupports* aElement, void *aData)
{
nsresult rv;
nsCOMPtr<nsIDirectoryServiceProvider> prov = do_QueryInterface(aElement);
if (!prov)
return PR_FALSE;
FileData* fileData = (FileData*)aData;
prov->GetFile(fileData->property, &fileData->persistent, &(fileData->file) );
if (fileData->file)
rv = prov->GetFile(fileData->property, &fileData->persistent, &(fileData->file) );
if (NS_SUCCEEDED(rv) && fileData->file)
return PR_FALSE;
return PR_TRUE;
@ -661,12 +662,25 @@ nsDirectoryService::RegisterProvider(nsIDirectoryServiceProvider *prov)
// AppendElement returns TRUE if it succeeded.
// Until this is fixed, fix up the result here.
nsresult invertedResult;
invertedResult = mProviders->AppendElement(supports);
return invertedResult ? NS_OK : NS_ERROR_FAILURE;
rv = mProviders->AppendElement(supports) ? NS_OK : NS_ERROR_FAILURE;
return rv;
}
NS_IMETHODIMP
nsDirectoryService::UnregisterProvider(nsIDirectoryServiceProvider *prov)
{
nsresult rv;
if (!prov)
return NS_ERROR_FAILURE;
nsCOMPtr<nsISupports> supports = do_QueryInterface(prov, &rv);
if (NS_FAILED(rv)) return rv;
// AppendElement returns TRUE if it succeeded.
// Until this is fixed, fix up the result here.
rv = mProviders->RemoveElement(supports) ? NS_OK : NS_ERROR_FAILURE;
return rv;
}
// DO NOT ADD ANY LOCATIONS TO THIS FUNCTION UNTIL YOU TALK TO: dougt@netscape.com.
// This is meant to be a place of xpcom or system specific file locations, not

1
xpcom/io/nsIDirectoryService.idl
View File

@ -34,6 +34,7 @@ interface nsIDirectoryService: nsISupports
{
void init(in string productName);
void registerProvider(in nsIDirectoryServiceProvider prov);
void unregisterProvider(in nsIDirectoryServiceProvider prov);
};
%{C++