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

use nsCOMPtr

Browse Source
This commit is contained in:
alecf%netscape.com 1999-05-05 06:43:34 +00:00
parent 8e8236674e
commit 3f9d9e1fee
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mailnews/base/src/nsMsgMailSession.cpp
View File

@ -23,7 +23,7 @@
#include "nsMsgMailSession.h"
#include "nsMsgLocalCID.h"
#include "nsMsgBaseCID.h"
//#include "nsIPref.h"
#include "nsCOMPtr.h"
NS_IMPL_ISUPPORTS(nsMsgMailSession, nsIMsgMailSession::GetIID());
@ -34,6 +34,7 @@ static NS_DEFINE_CID(kMsgAccountManagerCID, NS_MSGACCOUNTMANAGER_CID);
nsMsgMailSession::nsMsgMailSession():
mRefCnt(0),
m_accountManager(0)
{
NS_INIT_REFCNT();
@ -51,7 +52,7 @@ nsMsgMailSession::nsMsgMailSession():
nsMsgMailSession::~nsMsgMailSession()
{
NS_IF_RELEASE(m_accountManager);
NS_IF_RELEASE(m_accountManager);
}
@ -59,32 +60,28 @@ nsMsgMailSession::~nsMsgMailSession()
nsresult nsMsgMailSession::GetCurrentIdentity(nsIMsgIdentity ** aIdentity)
{
nsresult rv=NS_ERROR_UNEXPECTED;
nsIMsgAccount *defaultAccount;
nsCOMPtr<nsIMsgAccount> defaultAccount;
if (m_accountManager)
rv = m_accountManager->GetDefaultAccount(&defaultAccount);
rv = m_accountManager->GetDefaultAccount(getter_AddRefs(defaultAccount));
if (NS_FAILED(rv)) return rv;
rv = defaultAccount->GetDefaultIdentity(aIdentity);
NS_IF_RELEASE(defaultAccount);
return rv;
}
nsresult nsMsgMailSession::GetCurrentServer(nsIMsgIncomingServer ** aServer)
{
nsresult rv=NS_ERROR_UNEXPECTED;
nsIMsgAccount *defaultAccount;
nsCOMPtr<nsIMsgAccount> defaultAccount;
if (m_accountManager)
rv = m_accountManager->GetDefaultAccount(&defaultAccount);
rv = m_accountManager->GetDefaultAccount(getter_AddRefs(defaultAccount));
if (NS_FAILED(rv)) return rv;
rv = defaultAccount->GetIncomingServer(aServer);
NS_IF_RELEASE(defaultAccount);
return rv;
}
@ -93,6 +90,5 @@ nsresult nsMsgMailSession::GetAccountManager(nsIMsgAccountManager* *aAM)
if (!aAM) return NS_ERROR_NULL_POINTER;
*aAM = m_accountManager;
NS_ADDREF(m_accountManager);
return NS_OK;
}