fix problem replaying offline imap operations, remove unused adopt method r=naving, sr=sspitzer 76668

mailnews/imap/src/nsImapMailFolder.cpp

@@ -182,6 +182,7 @@ nsImapMailFolder::nsImapMailFolder() :
                                             getter_AddRefs(m_eventQueue));
   m_moveCoalescer = nsnull;
   m_boxFlags = 0;
+  m_uidValidity = 0;
   m_hierarchyDelimiter = kOnlineHierarchySeparatorUnknown;
   m_pathName = nsnull;
 }
@@ -1583,13 +1584,6 @@ nsImapMailFolder::MarkMessagesFlagged(nsISupportsArray *messages, PRBool markFla
 }
 
 
-NS_IMETHODIMP nsImapMailFolder::Adopt(nsIMsgFolder *srcFolder, 
-                                      PRUint32 *outPos)
-{
-    nsresult rv = NS_ERROR_FAILURE;
-    return rv;
-}
-
 NS_IMETHODIMP nsImapMailFolder::SetOnlineName(const char * aOnlineFolderName)
 {
   nsresult rv;
@@ -4224,14 +4218,17 @@ NS_IMETHODIMP
 nsImapMailFolder::GetStoredUIDValidity(nsIImapProtocol* aProtocol,
                                        uid_validity_info* aInfo)
 {
-    return NS_ERROR_FAILURE;
+  NS_ENSURE_ARG(aInfo);
+  aInfo->returnValidity = m_uidValidity;
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsImapMailFolder::LiteSelectUIDValidity(nsIImapProtocol* aProtocol,
                                         PRUint32 uidValidity)
 {
-    return NS_ERROR_FAILURE;
+  m_uidValidity = uidValidity;
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsImapMailFolder::GetPath(nsIFileSpec ** aPathName)

mailnews/imap/src/nsImapMailFolder.h

@@ -129,7 +129,6 @@ public:
   NS_IMETHOD EmptyTrash(nsIMsgWindow *msgWindow, nsIUrlListener *aListener);
 	NS_IMETHOD Delete ();
 	NS_IMETHOD Rename (const PRUnichar *newName, nsIMsgWindow *msgWindow);
-	NS_IMETHOD Adopt(nsIMsgFolder *srcFolder, PRUint32 *outPos);
     NS_IMETHOD GetNoSelect(PRBool *aResult);
 
 	NS_IMETHOD GetPrettyName(PRUnichar ** prettyName);	// Override of the base, for top-level mail folder
@@ -351,6 +350,7 @@ protected:
 	PRBool				m_msgMovedByFilter;
 	nsImapMoveCoalescer *m_moveCoalescer;
 	nsMsgKey			m_curMsgUid;
+  PRUint32    m_uidValidity;
 	PRInt32			m_nextMessageByteLength;
   nsCOMPtr<nsIEventQueue> m_eventQueue;
   PRBool m_urlRunning;