From de71be9891c71569c99db0189dda43572214820d Mon Sep 17 00:00:00 2001 From: "jefft%netscape.com" Date: Thu, 29 Apr 1999 00:10:55 +0000 Subject: [PATCH] fixed bug 5662 - imap failed to discover folders and downloading mail messages; make sure we are generating correct message URI; r=mscott,bienvenu; a=chofmann --- mailnews/imap/src/nsImapMailFolder.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mailnews/imap/src/nsImapMailFolder.cpp b/mailnews/imap/src/nsImapMailFolder.cpp index 3bde8f6375a..b1d2794e67c 100644 --- a/mailnews/imap/src/nsImapMailFolder.cpp +++ b/mailnews/imap/src/nsImapMailFolder.cpp @@ -1236,10 +1236,8 @@ NS_IMETHODIMP nsImapMailFolder::CreateMessageFromMsgDBHdr(nsIMsgDBHdr *msgDBHdr, rv = msgDBHdr->GetMessageKey(&key); if(NS_SUCCEEDED(rv)) - rv = GetPathName(path); + rv = nsBuildImapMessageURI(mURI, key, &msgURI); - if(NS_SUCCEEDED(rv)) - rv = nsBuildImapMessageURI(path, key, &msgURI); if(NS_SUCCEEDED(rv)) { @@ -1336,8 +1334,12 @@ NS_IMETHODIMP nsImapMailFolder::OnKeyAdded(nsMsgKey aKeyChanged, NS_IMETHODIMP nsImapMailFolder::OnAnnouncerGoingAway(nsIDBChangeAnnouncer * instigator) { - nsresult rv = NS_ERROR_FAILURE; - return rv; + if (m_mailDatabase) + { + m_mailDatabase->RemoveListener(this); + m_mailDatabase = nsnull; + } + return NS_OK; } NS_IMETHODIMP nsImapMailFolder::BeginCopy(nsIMessage *message)