Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 385695 Remove nsIAddressBook::modifyAddressBook - use nsIAbDirectory functions directly. r=bienvenu,sr=mscott

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@241164 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugzilla%standard8.demon.co.uk
2007-12-13 22:33:26 +00:00
parent 0c3b55e811
commit cd11edfc57
3 changed files with 1 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/mailnews/addrbook/public/nsIAbManager.idl
View File

@@ -48,7 +48,6 @@ interface nsIAbCard;
interface nsIAddressBook : nsISupports
{
void newAddressBook(in nsIAbDirectoryProperties aProperties);
void modifyAddressBook(in nsIRDFDataSource aDS, in nsIAbDirectory aParentDir, in nsIAbDirectory aDirectory, in nsIAbDirectoryProperties aProperties);
void deleteAddressBooks(in nsIRDFDataSource aDS, in nsISupportsArray aParentDir, in nsISupportsArray aResourceArray);
void exportAddressBook(in nsIDOMWindow aParentWin, in nsIAbDirectory aDirectory);
nsIAddrDatabase getAbDatabaseFromURI(in string URI);

28
mozilla/mailnews/addrbook/src/nsAbManager.cpp
View File

@@ -194,34 +194,6 @@ NS_IMETHODIMP nsAddressBook::NewAddressBook(nsIAbDirectoryProperties *aPropertie
return rv;
}
NS_IMETHODIMP nsAddressBook::ModifyAddressBook
(nsIRDFDataSource* aDS, nsIAbDirectory *aParentDir, nsIAbDirectory *aDirectory, nsIAbDirectoryProperties *aProperties)
{
NS_ENSURE_ARG_POINTER(aDS);
NS_ENSURE_ARG_POINTER(aParentDir);
NS_ENSURE_ARG_POINTER(aDirectory);
NS_ENSURE_ARG_POINTER(aProperties);
nsresult rv;
nsCOMPtr<nsISupportsArray> parentArray (do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsISupportsArray> resourceElement (do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsISupportsArray> resourceArray (do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
parentArray->AppendElement(aParentDir);
nsCOMPtr<nsIRDFResource> dirSource(do_QueryInterface(aDirectory, &rv));
NS_ENSURE_SUCCESS(rv, rv);
resourceElement->AppendElement(dirSource);
resourceElement->AppendElement(aProperties);
resourceArray->AppendElement(resourceElement);
return DoCommand(aDS, NS_LITERAL_CSTRING(NC_RDF_MODIFY), parentArray, resourceArray);
}
NS_IMETHODIMP nsAddressBook::DeleteAddressBooks
(nsIRDFDataSource* aDS, nsISupportsArray *aParentDir, nsISupportsArray *aResourceArray)
{

3
mozilla/mailnews/addrbook/src/nsAbManager.h
View File

@@ -55,7 +55,6 @@ class nsIAbDirectory;
class nsIAbLDAPAttributeMap;
#define NC_RDF_NEWABCARD NC_NAMESPACE_URI "NewCard"
#define NC_RDF_MODIFY NC_NAMESPACE_URI "Modify"
#define NC_RDF_DELETE NC_NAMESPACE_URI "Delete"
#define NC_RDF_DELETECARD NC_NAMESPACE_URI "DeleteCards"
#define NC_RDF_NEWDIRECTORY NC_NAMESPACE_URI "NewDirectory"
@@ -99,7 +98,7 @@ public:
NS_DECL_NSICONTENTHANDLER
NS_DECL_NSISTREAMLOADEROBSERVER
NS_DECL_NSICOMMANDLINEHANDLER
protected:
nsresult DoCommand(nsIRDFDataSource *db, const nsACString& command,
nsISupportsArray *srcArray, nsISupportsArray *arguments);