зеркало из https://github.com/mozilla/pjs.git
50722, 58083. sr=sspitzer, bienvenu No need to reset the ImapConnection. The IMAP code
now uses the exisiting connection.
This commit is contained in:
Родитель
4695b5608c
Коммит
251ccb942a
|
@ -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<nsIMsgIncomingServer> aMsgIncomingServer;
|
||||
nsCOMPtr<nsIMsgMailNewsUrl> msgUrl = do_QueryInterface(aImapUrl, &rv);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
rv = msgUrl->GetServer(getter_AddRefs(aMsgIncomingServer));
|
||||
if (NS_SUCCEEDED(rv) && aMsgIncomingServer)
|
||||
{
|
||||
nsCOMPtr<nsIImapIncomingServer> 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);
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче