remove shutdown listener code.

r=bienvenu
This commit is contained in:
mscott%netscape.com 1999-11-01 00:55:06 +00:00
parent 48fdb40dd9
commit e43e2e5d9e
2 changed files with 4 additions and 50 deletions

View File

@ -38,36 +38,7 @@
static NS_DEFINE_CID(kMsgIdentityCID, NS_MSGIDENTITY_CID);
static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
NS_IMPL_ADDREF(nsMsgAccount)
NS_IMPL_RELEASE(nsMsgAccount)
nsresult
nsMsgAccount::QueryInterface(const nsIID& iid, void **result)
{
nsresult rv = NS_NOINTERFACE;
if (!result)
return NS_ERROR_NULL_POINTER;
void *res = nsnull;
if (iid.Equals(nsCOMTypeInfo<nsIMsgAccount>::GetIID()) ||
iid.Equals(nsCOMTypeInfo<nsISupports>::GetIID()))
res = NS_STATIC_CAST(nsIMsgAccount*, this);
else if (iid.Equals(nsCOMTypeInfo<nsIShutdownListener>::GetIID()))
res = NS_STATIC_CAST(nsIShutdownListener*, this);
if (res) {
NS_ADDREF(this);
*result = res;
rv = NS_OK;
}
return rv;
}
NS_IMPL_ISUPPORTS(nsMsgAccount, NS_GET_IID(nsIMsgAccount));
nsMsgAccount::nsMsgAccount():
m_accountKey(0),
@ -84,7 +55,7 @@ nsMsgAccount::~nsMsgAccount()
// release of servers an identites happen automatically
// thanks to nsCOMPtrs and nsISupportsArray
if (m_prefs) nsServiceManager::ReleaseService(kPrefServiceCID, m_prefs);
PR_FREEIF(m_accountKey);
}
@ -105,8 +76,7 @@ nsMsgAccount::getPrefService() {
return nsServiceManager::GetService(kPrefServiceCID,
nsCOMTypeInfo<nsIPref>::GetIID(),
(nsISupports**)&m_prefs,
this);
(nsISupports**)&m_prefs);
}
NS_IMETHODIMP
@ -382,16 +352,4 @@ nsMsgAccount::ToString(PRUnichar **aResult)
return NS_OK;
}
/* called if the prefs service goes offline */
NS_IMETHODIMP
nsMsgAccount::OnShutdown(const nsCID& aClass, nsISupports *service)
{
if (aClass.Equals(kPrefServiceCID)) {
if (m_prefs) nsServiceManager::ReleaseService(kPrefServiceCID, m_prefs);
m_prefs = nsnull;
}
return NS_OK;
}

View File

@ -19,8 +19,7 @@
#include "nscore.h"
#include "nsIMsgAccount.h"
class nsMsgAccount : public nsIMsgAccount,
public nsIShutdownListener
class nsMsgAccount : public nsIMsgAccount
{
public:
@ -30,9 +29,6 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIMSGACCOUNT
// nsIShutdownListener
NS_IMETHOD OnShutdown(const nsCID& aClass, nsISupports *service);
private:
char *m_accountKey;