diff --git a/xpfe/AppCores/idl/ProfileCore.idl b/xpfe/AppCores/idl/ProfileCore.idl index 1eed859b5496..e9ca1769637b 100644 --- a/xpfe/AppCores/idl/ProfileCore.idl +++ b/xpfe/AppCores/idl/ProfileCore.idl @@ -7,7 +7,7 @@ interface ProfileCore : BaseAppCore void CreateNewProfile(in wstring data); void RenameProfile(in wstring oldName, in wstring newName); - void DeleteProfile(in wstring profileName); + void DeleteProfile(in wstring profileName, in wstring deleteFlag); wstring GetProfileList(); void StartCommunicator(in wstring profileName); wstring GetCurrentProfile(); diff --git a/xpfe/AppCores/public/nsIDOMProfileCore.h b/xpfe/AppCores/public/nsIDOMProfileCore.h index e05fd885046b..b6630519e41b 100644 --- a/xpfe/AppCores/public/nsIDOMProfileCore.h +++ b/xpfe/AppCores/public/nsIDOMProfileCore.h @@ -38,7 +38,7 @@ public: NS_IMETHOD RenameProfile(const nsString& aOldName, const nsString& aNewName)=0; - NS_IMETHOD DeleteProfile(const nsString& aProfileName)=0; + NS_IMETHOD DeleteProfile(const nsString& aProfileName, const nsString& aDeleteFlag)=0; NS_IMETHOD GetProfileList(nsString& aReturn)=0; @@ -53,7 +53,7 @@ public: #define NS_DECL_IDOMPROFILECORE \ NS_IMETHOD CreateNewProfile(const nsString& aData); \ NS_IMETHOD RenameProfile(const nsString& aOldName, const nsString& aNewName); \ - NS_IMETHOD DeleteProfile(const nsString& aProfileName); \ + NS_IMETHOD DeleteProfile(const nsString& aProfileName, const nsString& aDeleteFlag); \ NS_IMETHOD GetProfileList(nsString& aReturn); \ NS_IMETHOD StartCommunicator(const nsString& aProfileName); \ NS_IMETHOD GetCurrentProfile(nsString& aReturn); \ @@ -64,7 +64,7 @@ public: #define NS_FORWARD_IDOMPROFILECORE(_to) \ NS_IMETHOD CreateNewProfile(const nsString& aData) { return _to CreateNewProfile(aData); } \ NS_IMETHOD RenameProfile(const nsString& aOldName, const nsString& aNewName) { return _to RenameProfile(aOldName, aNewName); } \ - NS_IMETHOD DeleteProfile(const nsString& aProfileName) { return _to DeleteProfile(aProfileName); } \ + NS_IMETHOD DeleteProfile(const nsString& aProfileName, const nsString& aDeleteFlag) { return _to DeleteProfile(aProfileName, aDeleteFlag); } \ NS_IMETHOD GetProfileList(nsString& aReturn) { return _to GetProfileList(aReturn); } \ NS_IMETHOD StartCommunicator(const nsString& aProfileName) { return _to StartCommunicator(aProfileName); } \ NS_IMETHOD GetCurrentProfile(nsString& aReturn) { return _to GetCurrentProfile(aReturn); } \ diff --git a/xpfe/AppCores/src/nsProfileCore.cpp b/xpfe/AppCores/src/nsProfileCore.cpp index e77b6bace1df..811554125371 100644 --- a/xpfe/AppCores/src/nsProfileCore.cpp +++ b/xpfe/AppCores/src/nsProfileCore.cpp @@ -180,7 +180,7 @@ NS_IMETHODIMP nsProfileCore::RenameProfile(const nsString& oldName, const nsStri //---------------------------------------------------------------------------------------- -NS_IMETHODIMP nsProfileCore::DeleteProfile(const nsString& profileName) +NS_IMETHODIMP nsProfileCore::DeleteProfile(const nsString& profileName, const nsString& deleteFlag) // Start loading of a new Profile panel. //---------------------------------------------------------------------------------------- { @@ -188,7 +188,7 @@ NS_IMETHODIMP nsProfileCore::DeleteProfile(const nsString& profileName) printf ("Requesting deletion of profile -> %s <-\n", profileName.ToNewCString()); - mProfile->DeleteProfile(profileName.ToNewCString()); + mProfile->DeleteProfile(profileName.ToNewCString(), deleteFlag.ToNewCString()); return NS_OK; } diff --git a/xpfe/AppCores/src/nsProfileCore.h b/xpfe/AppCores/src/nsProfileCore.h index 47ca8ddb533e..b4157cfdfab8 100644 --- a/xpfe/AppCores/src/nsProfileCore.h +++ b/xpfe/AppCores/src/nsProfileCore.h @@ -124,7 +124,7 @@ class nsProfileCore NS_IMETHOD CreateNewProfile(const nsString& aData); NS_IMETHOD RenameProfile(const nsString& oldName, const nsString& newName); - NS_IMETHOD DeleteProfile(const nsString& profileName); + NS_IMETHOD DeleteProfile(const nsString& profileName, const nsString& deleteFlag); NS_IMETHOD GetProfileList(nsString& profileList); NS_IMETHOD StartCommunicator(const nsString& profileName);