diff --git a/mailnews/imap/src/nsImapService.cpp b/mailnews/imap/src/nsImapService.cpp index 4fd8b105357b..1137a01cc220 100644 --- a/mailnews/imap/src/nsImapService.cpp +++ b/mailnews/imap/src/nsImapService.cpp @@ -1361,8 +1361,6 @@ nsImapService::DeleteFolder(nsIEventQueue* eventQueue, rv = uri->SetSpec((char*) urlSpec.GetBuffer()); if (NS_SUCCEEDED(rv)) { - rv = ResetImapConnection(imapUrl, - (const char*) folderName); rv = GetImapConnectionAndLoadUrl(eventQueue, imapUrl, nsnull, url); @@ -1940,25 +1938,6 @@ nsImapService::AppendMessageFromFile(nsIEventQueue* aClientEventQueue, return rv; } -nsresult -nsImapService::ResetImapConnection(nsIImapUrl* aImapUrl, - const char *folderName) -{ - nsresult rv = NS_OK; - nsCOMPtr aMsgIncomingServer; - nsCOMPtr msgUrl = do_QueryInterface(aImapUrl, &rv); - if (NS_FAILED(rv)) return rv; - rv = msgUrl->GetServer(getter_AddRefs(aMsgIncomingServer)); - if (NS_SUCCEEDED(rv) && aMsgIncomingServer) - { - nsCOMPtr aImapServer = - do_QueryInterface(aMsgIncomingServer, &rv); - if (NS_SUCCEEDED(rv) && aImapServer) - rv = aImapServer->ResetConnection(folderName); - } - return rv; -} - nsresult nsImapService::GetImapConnectionAndLoadUrl(nsIEventQueue* aClientEventQueue, nsIImapUrl* aImapUrl, @@ -2042,7 +2021,6 @@ nsImapService::MoveFolder(nsIEventQueue* eventQueue, nsIMsgFolder* srcFolder, if (NS_SUCCEEDED(rv)) { GetFolderName(srcFolder, getter_Copies(folderName)); - rv = ResetImapConnection(imapUrl, (const char*)folderName); rv = GetImapConnectionAndLoadUrl(eventQueue, imapUrl, nsnull, url); @@ -2101,7 +2079,6 @@ nsImapService::RenameLeaf(nsIEventQueue* eventQueue, nsIMsgFolder* srcFolder, rv = uri->SetSpec((char*) urlSpec.GetBuffer()); if (NS_SUCCEEDED(rv)) { - rv = ResetImapConnection(imapUrl, (const char *) folderName); rv = GetImapConnectionAndLoadUrl(eventQueue, imapUrl, nsnull, url); } diff --git a/mailnews/imap/src/nsImapService.h b/mailnews/imap/src/nsImapService.h index 4a45dc6da092..b11c0b31ec31 100644 --- a/mailnews/imap/src/nsImapService.h +++ b/mailnews/imap/src/nsImapService.h @@ -83,7 +83,6 @@ protected: nsIImapUrl* aImapUrl, nsISupports* aConsumer, nsIURI** aURL); - nsresult ResetImapConnection(nsIImapUrl* aImapUrl, const char *folderName); nsresult SetImapUrlSink(nsIMsgFolder* aMsgFolder, nsIImapUrl* aImapUrl); nsresult FetchMimePart(nsIImapUrl * aImapUrl,