Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 349569, crash closing stand-alone msg window opened from cross-folder saved search, sr=sspitzer, and fix history navigation in standalone message window, sr=mscott, 74959

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@208111 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bienvenu%nventure.com 2006-08-22 21:55:37 +00:00
parent b23ab51c44
commit 13e26cb372
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/mailnews/base/src/nsMsgDBView.cpp
View File

@ -5069,9 +5069,12 @@ NS_IMETHODIMP nsMsgDBView::NavigateStatus(nsMsgNavigationTypeValue motion, PRBoo
PRBool enable = PR_FALSE;
nsresult rv = NS_ERROR_FAILURE;
nsMsgKey resultKey = nsMsgKey_None;
PRInt32 index;
PRInt32 index = nsMsgKey_None;
nsMsgViewIndex resultIndex = nsMsgViewIndex_None;
rv = mTreeSelection->GetCurrentIndex(&index);
if (mTreeSelection)
(void) mTreeSelection->GetCurrentIndex(&index);
else
index = FindViewIndex(m_currentlyDisplayedMsgKey);
// warning - we no longer validate index up front because fe passes in -1 for no
// selection, so if you use index, be sure to validate it before using it
@ -5794,6 +5797,8 @@ nsresult nsMsgDBView::CopyDBView(nsMsgDBView *aNewMsgDBView, nsIMessenger *aMess
NS_ENSURE_ARG_POINTER(aNewMsgDBView);
aNewMsgDBView->mMsgWindow = aMsgWindow;
if (aMsgWindow)
aMsgWindow->SetOpenFolder(m_viewFolder? m_viewFolder : m_folder);
aNewMsgDBView->mMessengerInstance = aMessengerInstance;
aNewMsgDBView->mCommandUpdater = aCmdUpdater;
aNewMsgDBView->m_folder = m_folder;

2
mozilla/mailnews/base/src/nsMsgXFVirtualFolderDBView.cpp
View File

@ -118,7 +118,7 @@ nsMsgXFVirtualFolderDBView::CopyDBView(nsMsgDBView *aNewMsgDBView, nsIMessenger
newMsgDBView->m_viewFolder = m_viewFolder;
newMsgDBView->m_numUnread = m_numUnread;
newMsgDBView->m_numTotal = m_numTotal;
newMsgDBView->m_searchSession = m_searchSession;
return NS_OK;
}

1
mozilla/mailnews/base/src/nsMsgXFVirtualFolderDBView.h
View File

@ -73,7 +73,6 @@ public:
protected:
nsCOMPtr <nsIMsgFolder> m_viewFolder;
PRUint32 m_cachedFolderArrayIndex; // array index of next folder with cached hits to deal with.
nsCOMArray<nsIMsgFolder> m_foldersWithNonVerifiedCachedHits;
nsCOMArray<nsIMsgDBHdr> m_hdrHits;