From 4bd138ca34bac5faad970d821b1eb811bca8f1f9 Mon Sep 17 00:00:00 2001 From: "jefft%netscape.com" Date: Tue, 8 Feb 2000 15:48:20 +0000 Subject: [PATCH] fixed bug 23089 -- selecting undo after delete cause trash folder to load; r=bienvenu --- mailnews/local/src/nsLocalUndoTxn.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mailnews/local/src/nsLocalUndoTxn.cpp b/mailnews/local/src/nsLocalUndoTxn.cpp index b7e558fd4b4..6ed1bf59244 100644 --- a/mailnews/local/src/nsLocalUndoTxn.cpp +++ b/mailnews/local/src/nsLocalUndoTxn.cpp @@ -169,6 +169,11 @@ nsLocalMoveCopyMsgTxn::UndoImapDeleteFlag(nsIMsgFolder* folder, getter_AddRefs(eventQueue)); if (eventQueue) { + // This is to make sure that we are in the selected state + // when executing the imap url; we don't want to load the + // folder so use lite select to do the trick + rv = imapService->LiteSelectFolder(eventQueue, folder, + urlListener, nsnull); if (addFlag) rv =imapService->AddMessageFlags(eventQueue, folder, urlListener, nsnull, @@ -182,9 +187,8 @@ nsLocalMoveCopyMsgTxn::UndoImapDeleteFlag(nsIMsgFolder* folder, msgIds.GetBuffer(), kImapMsgDeletedFlag, PR_TRUE); - if (NS_SUCCEEDED(rv)) - imapService->SelectFolder(eventQueue, folder, - urlListener, nsnull, nsnull); + if (NS_SUCCEEDED(rv) && m_msgWindow) + folder->UpdateFolder(m_msgWindow); } } }