From cd11edfc571149c61d24b5e9876bf27173dc418e Mon Sep 17 00:00:00 2001 From: "bugzilla%standard8.demon.co.uk" Date: Thu, 13 Dec 2007 22:33:26 +0000 Subject: [PATCH] Bug 385695 Remove nsIAddressBook::modifyAddressBook - use nsIAbDirectory functions directly. r=bienvenu,sr=mscott git-svn-id: svn://10.0.0.236/trunk@241164 18797224-902f-48f8-a5cc-f745e15eee43 --- .../mailnews/addrbook/public/nsIAbManager.idl | 1 - mozilla/mailnews/addrbook/src/nsAbManager.cpp | 28 ------------------- mozilla/mailnews/addrbook/src/nsAbManager.h | 3 +- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/mozilla/mailnews/addrbook/public/nsIAbManager.idl b/mozilla/mailnews/addrbook/public/nsIAbManager.idl index e3edf42b8c7..a9b9b4fdb98 100644 --- a/mozilla/mailnews/addrbook/public/nsIAbManager.idl +++ b/mozilla/mailnews/addrbook/public/nsIAbManager.idl @@ -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); diff --git a/mozilla/mailnews/addrbook/src/nsAbManager.cpp b/mozilla/mailnews/addrbook/src/nsAbManager.cpp index 003318f684e..db5bc2c627e 100644 --- a/mozilla/mailnews/addrbook/src/nsAbManager.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbManager.cpp @@ -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 parentArray (do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID, &rv)); - NS_ENSURE_SUCCESS(rv, rv); - nsCOMPtr resourceElement (do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID, &rv)); - NS_ENSURE_SUCCESS(rv, rv); - nsCOMPtr resourceArray (do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID, &rv)); - NS_ENSURE_SUCCESS(rv, rv); - - parentArray->AppendElement(aParentDir); - - nsCOMPtr 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) { diff --git a/mozilla/mailnews/addrbook/src/nsAbManager.h b/mozilla/mailnews/addrbook/src/nsAbManager.h index 886386c994a..07376c79ab6 100644 --- a/mozilla/mailnews/addrbook/src/nsAbManager.h +++ b/mozilla/mailnews/addrbook/src/nsAbManager.h @@ -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);