From 99bdd67c6932fe934ee96ec2bdcbe9549bba7168 Mon Sep 17 00:00:00 2001
From: "bienvenu%netscape.com"
 <bienvenu%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 13 Aug 2001 23:51:13 +0000
Subject: [PATCH] fix bug 94249 messages copied into imap folder offline
 disappear if you go online with the dest folder open r=naving, sr=sspitzer

git-svn-id: svn://10.0.0.236/trunk@100950 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../mailnews/imap/src/nsImapMailFolder.cpp    | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
index b9e71df3ef3..81c9a4b494a 100644
--- a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
+++ b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
@@ -2832,6 +2832,7 @@ NS_IMETHODIMP nsImapMailFolder::ReplayOfflineMoveCopy(nsMsgKey *msgKeys, PRInt32
   nsCOMPtr<nsIImapService> imapService(do_GetService(kCImapService, &rv));
   if (NS_SUCCEEDED(rv))
   {
+    nsCOMPtr <nsIURI> resultUrl;
     nsCAutoString uids;
     AllocateUidStringFromKeys(msgKeys, numKeys, uids);
     rv = imapService->OnlineMessageCopy(m_eventQueue, 
@@ -2841,8 +2842,17 @@ NS_IMETHODIMP nsImapMailFolder::ReplayOfflineMoveCopy(nsMsgKey *msgKeys, PRInt32
                          PR_TRUE,
                          isMove,
                          aUrlListener,
-                         nsnull, nsnull, aWindow);
-
+                         getter_AddRefs(resultUrl), nsnull, aWindow);
+    if (resultUrl)
+    {
+      nsCOMPtr <nsIMsgMailNewsUrl> mailnewsUrl = do_QueryInterface(resultUrl);
+      if (mailnewsUrl)
+      {
+        nsCOMPtr <nsIUrlListener> folderListener = do_QueryInterface(aDstFolder);
+        if (folderListener)
+          mailnewsUrl->RegisterListener(folderListener);
+      }
+    }
   }
   return rv;
 }
@@ -3079,6 +3089,15 @@ void nsImapMailFolder::FindKeysToAdd(const nsMsgKeyArray &existingKeys, nsMsgKey
       NS_ASSERTION(uidOfMessage != nsMsgKey_None, "got invalid msg key");
       if (uidOfMessage != nsMsgKey_None && (showDeletedMessages || ! (flags & kImapMsgDeletedFlag)))
       {
+        if (mDatabase)
+        {
+          PRBool dbContainsKey;
+          if (NS_SUCCEEDED(mDatabase->ContainsKey(uidOfMessage, &dbContainsKey)) && dbContainsKey)
+          {
+            NS_ASSERTION(PR_FALSE, "db has key - flagState messed up?");
+            continue;
+          }
+        }
         keysToFetch.Add(uidOfMessage);
       }
     }
@@ -3795,14 +3814,17 @@ nsImapMailFolder::OnStopRunningUrl(nsIURI *aUrl, nsresult aExitCode)
         case nsIImapUrl::nsImapDeleteMsg:
         case nsIImapUrl::nsImapOnlineMove:
         case nsIImapUrl::nsImapOnlineCopy:
-          if (m_copyState)
+          if (NS_SUCCEEDED(aExitCode))
           {
-            if (NS_SUCCEEDED(aExitCode))
-            {
               if (folderOpen)
                 UpdateFolder(aWindow);
               else
                 UpdatePendingCounts(PR_TRUE, PR_FALSE);
+          }
+          if (m_copyState)
+          {
+            if (NS_SUCCEEDED(aExitCode))
+            {
               if (m_copyState->m_isMove && !m_copyState->m_isCrossServerOp)
               {
                 nsCOMPtr<nsIMsgFolder> srcFolder;