зеркало из https://github.com/mozilla/pjs.git
code cleanup. remove static cid.
This commit is contained in:
Родитель
3cfbdc48b2
Коммит
f31824b22c
|
@ -45,10 +45,8 @@
|
||||||
#include "nsIMsgIncomingServer.h"
|
#include "nsIMsgIncomingServer.h"
|
||||||
#include "nsIDBFolderInfo.h"
|
#include "nsIDBFolderInfo.h"
|
||||||
|
|
||||||
static NS_DEFINE_CID(kCImapService, NS_IMAPSERVICE_CID);
|
|
||||||
static NS_DEFINE_CID(kCImapHostSessionList, NS_IIMAPHOSTSESSIONLIST_CID);
|
static NS_DEFINE_CID(kCImapHostSessionList, NS_IIMAPHOSTSESSIONLIST_CID);
|
||||||
|
|
||||||
|
|
||||||
nsImapMoveCopyMsgTxn::nsImapMoveCopyMsgTxn() :
|
nsImapMoveCopyMsgTxn::nsImapMoveCopyMsgTxn() :
|
||||||
m_idsAreUids(PR_FALSE), m_isMove(PR_FALSE), m_srcIsPop3(PR_FALSE)
|
m_idsAreUids(PR_FALSE), m_isMove(PR_FALSE), m_srcIsPop3(PR_FALSE)
|
||||||
{
|
{
|
||||||
|
@ -161,9 +159,10 @@ nsImapMoveCopyMsgTxn::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsImapMoveCopyMsgTxn::UndoTransaction(void)
|
nsImapMoveCopyMsgTxn::UndoTransaction(void)
|
||||||
{
|
{
|
||||||
nsresult rv = NS_OK;
|
nsresult rv;
|
||||||
nsCOMPtr<nsIImapService> imapService(do_GetService(kCImapService, &rv));
|
nsCOMPtr<nsIImapService> imapService = do_GetService(NS_IMAPSERVICE_CONTRACTID, &rv);
|
||||||
if (NS_FAILED(rv)) return rv;
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
|
|
||||||
if (m_isMove || !m_dstFolder)
|
if (m_isMove || !m_dstFolder)
|
||||||
{
|
{
|
||||||
if (m_srcIsPop3)
|
if (m_srcIsPop3)
|
||||||
|
@ -240,10 +239,11 @@ nsImapMoveCopyMsgTxn::UndoTransaction(void)
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsImapMoveCopyMsgTxn::RedoTransaction(void)
|
nsImapMoveCopyMsgTxn::RedoTransaction(void)
|
||||||
{
|
{
|
||||||
nsresult rv = NS_OK;
|
nsresult rv;
|
||||||
nsCOMPtr<nsIImapService> imapService(do_GetService(kCImapService, &rv));
|
nsCOMPtr<nsIImapService> imapService = do_GetService(NS_IMAPSERVICE_CONTRACTID, &rv);
|
||||||
if (NS_FAILED(rv)) return rv;
|
NS_ENSURE_SUCCESS(rv,rv);
|
||||||
if (m_isMove || !m_dstFolder)
|
|
||||||
|
if (m_isMove || !m_dstFolder)
|
||||||
{
|
{
|
||||||
if (m_srcIsPop3)
|
if (m_srcIsPop3)
|
||||||
{
|
{
|
||||||
|
|
Загрузка…
Ссылка в новой задаче