mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

QI url to the right type for nsIMsgMailNewsurl methods.

This commit is contained in:
mscott%netscape.com 1999-06-22 21:53:34 +00:00
Родитель aa59d9ab82
Коммит c96a3e5fd9
2 изменённых файлов: 62 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
mailnews/imap/src/nsImapServerResponseParser.cpp
Просмотреть файл

@ -861,7 +861,11 @@ void nsImapServerResponseParser::mailbox(mailbox_spec *boxSpec)
//boxSpec->hostName = nsnull; //boxSpec->hostName = nsnull;
//if (boxSpec->connection && boxSpec->connection->GetCurrentUrl()) //if (boxSpec->connection && boxSpec->connection->GetCurrentUrl())
boxSpec->connection->GetCurrentUrl()->AllocateCanonicalPath(boxname, boxSpec->hierarchySeparator, &boxSpec->allocatedPathName); boxSpec->connection->GetCurrentUrl()->AllocateCanonicalPath(boxname, boxSpec->hierarchySeparator, &boxSpec->allocatedPathName);
boxSpec->connection->GetCurrentUrl()->GetHost(&boxSpec->hostName); nsIURL * aURL = nsnull;
boxSpec->connection->GetCurrentUrl()->QueryInterface(nsIURL::GetIID(), (void **) &aURL);
if (aURL)
aURL->GetHost(&boxSpec->hostName);
NS_IF_RELEASE(aURL);
if (boxname) if (boxname)
PL_strfree( boxname); PL_strfree( boxname);
// storage for the boxSpec is now owned by server connection // storage for the boxSpec is now owned by server connection
@ -2295,7 +2299,15 @@ struct mailbox_spec *nsImapServerResponseParser::CreateCurrentMailboxSpec(const
returnSpec->allocatedPathName = convertedMailboxName; returnSpec->allocatedPathName = convertedMailboxName;
returnSpec->connection = &fServerConnection; returnSpec->connection = &fServerConnection;
if (returnSpec->connection) if (returnSpec->connection)
returnSpec->connection->GetCurrentUrl()->GetHost(&returnSpec->hostName); {
nsIURL * aUrl = nsnull;
nsresult rv = NS_OK;
returnSpec->connection->GetCurrentUrl()->QueryInterface(nsIURL::GetIID(), (void **) &aUrl);
if (NS_SUCCEEDED(rv) && aUrl)
aUrl->GetHost(&returnSpec->hostName);
NS_IF_RELEASE(aUrl);
}
else else
returnSpec->hostName = nsnull; returnSpec->hostName = nsnull;
if (fFlagState) if (fFlagState)

64
mailnews/imap/src/nsImapService.cpp
Просмотреть файл

@ -147,7 +147,9 @@ nsImapService::SelectFolder(nsIEventQueue * aClientEventQueue,
GetFolderName(aImapMailFolder, folderName); GetFolderName(aImapMailFolder, folderName);
urlSpec.Append("/select>/"); urlSpec.Append("/select>/");
urlSpec.Append(folderName.GetBuffer()); urlSpec.Append(folderName.GetBuffer());
rv = imapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(imapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, rv = GetImapConnectionAndLoadUrl(aClientEventQueue,
imapUrl, imapUrl,
@ -198,7 +200,9 @@ nsImapService::LiteSelectFolder(nsIEventQueue * aClientEventQueue,
nsString2 folderName("", eOneByte); nsString2 folderName("", eOneByte);
GetFolderName(aImapMailFolder, folderName); GetFolderName(aImapMailFolder, folderName);
urlSpec.Append(folderName.GetBuffer()); urlSpec.Append(folderName.GetBuffer());
rv = imapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(imapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl, rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl,
aUrlListener, nsnull, aURL); aUrlListener, nsnull, aURL);
@ -316,7 +320,9 @@ nsImapService::FetchMessage(nsIEventQueue * aClientEventQueue,
urlSpec.Append(folderName.GetBuffer()); urlSpec.Append(folderName.GetBuffer());
urlSpec.Append(">"); urlSpec.Append(">");
urlSpec.Append(messageIdentifierList); urlSpec.Append(messageIdentifierList);
rv = imapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(imapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl, rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl,
aUrlListener, aUrlListener,
@ -364,7 +370,9 @@ nsImapService::CreateStartOfImapUrl(nsIImapUrl * &imapUrl,
urlSpec.Append(hostname); urlSpec.Append(hostname);
// *** jefft - force to parse the urlSpec in order to search for // *** jefft - force to parse the urlSpec in order to search for
// the correct incoming server // the correct incoming server
imapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(imapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
} }
@ -418,7 +426,9 @@ nsImapService::GetHeaders(nsIEventQueue * aClientEventQueue,
urlSpec.Append(folderName.GetBuffer()); urlSpec.Append(folderName.GetBuffer());
urlSpec.Append(">"); urlSpec.Append(">");
urlSpec.Append(messageIdentifierList); urlSpec.Append(messageIdentifierList);
rv = imapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(imapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl, rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl,
@ -465,7 +475,9 @@ nsImapService::Noop(nsIEventQueue * aClientEventQueue,
nsString2 folderName("", eOneByte); nsString2 folderName("", eOneByte);
GetFolderName(aImapMailFolder, folderName); GetFolderName(aImapMailFolder, folderName);
urlSpec.Append(folderName.GetBuffer()); urlSpec.Append(folderName.GetBuffer());
rv = imapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(imapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl, rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl,
aUrlListener, nsnull, aURL); aUrlListener, nsnull, aURL);
@ -508,7 +520,9 @@ nsImapService::Expunge(nsIEventQueue * aClientEventQueue,
nsString2 folderName("", eOneByte); nsString2 folderName("", eOneByte);
GetFolderName(aImapMailFolder, folderName); GetFolderName(aImapMailFolder, folderName);
urlSpec.Append(folderName.GetBuffer()); urlSpec.Append(folderName.GetBuffer());
rv = imapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(imapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl, rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl,
aUrlListener, nsnull, aURL); aUrlListener, nsnull, aURL);
@ -556,7 +570,9 @@ nsImapService::Biff(nsIEventQueue * aClientEventQueue,
urlSpec.Append(folderName.GetBuffer()); urlSpec.Append(folderName.GetBuffer());
urlSpec.Append(">"); urlSpec.Append(">");
urlSpec.Append(uidHighWater, 10); urlSpec.Append(uidHighWater, 10);
rv = imapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(imapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl, rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl,
aUrlListener, nsnull, aURL); aUrlListener, nsnull, aURL);
@ -607,7 +623,9 @@ nsImapService::DeleteMessages(nsIEventQueue * aClientEventQueue,
urlSpec.Append(folderName.GetBuffer()); urlSpec.Append(folderName.GetBuffer());
urlSpec.Append(">"); urlSpec.Append(">");
urlSpec.Append(messageIdentifierList); urlSpec.Append(messageIdentifierList);
rv = imapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(imapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl, rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl,
aUrlListener, nsnull, aURL); aUrlListener, nsnull, aURL);
@ -651,7 +669,9 @@ nsImapService::DeleteAllMessages(nsIEventQueue * aClientEventQueue,
nsString2 folderName("", eOneByte); nsString2 folderName("", eOneByte);
GetFolderName(aImapMailFolder, folderName); GetFolderName(aImapMailFolder, folderName);
urlSpec.Append(folderName.GetBuffer()); urlSpec.Append(folderName.GetBuffer());
rv = imapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(imapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl, rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl,
aUrlListener, nsnull, aURL); aUrlListener, nsnull, aURL);
@ -750,7 +770,9 @@ nsresult nsImapService::DiddleFlags(nsIEventQueue * aClientEventQueue,
urlSpec.Append(messageIdentifierList); urlSpec.Append(messageIdentifierList);
urlSpec.Append('>'); urlSpec.Append('>');
urlSpec.Append(flags, 10); urlSpec.Append(flags, 10);
rv = imapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(imapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl, rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl,
aUrlListener, nsnull, aURL); aUrlListener, nsnull, aURL);
@ -832,7 +854,9 @@ nsImapService::DiscoverAllFolders(nsIEventQueue* aClientEventQueue,
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
{ {
urlSpec.Append("/discoverallboxes"); urlSpec.Append("/discoverallboxes");
rv = aImapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(aImapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, aImapUrl, rv = GetImapConnectionAndLoadUrl(aClientEventQueue, aImapUrl,
aUrlListener, nsnull, aURL); aUrlListener, nsnull, aURL);
@ -866,7 +890,9 @@ nsImapService::DiscoverAllAndSubscribedFolders(nsIEventQueue* aClientEventQueue,
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
{ {
urlSpec.Append("/discoverallandsubscribedboxes"); urlSpec.Append("/discoverallandsubscribedboxes");
rv = aImapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(aImapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, aImapUrl, rv = GetImapConnectionAndLoadUrl(aClientEventQueue, aImapUrl,
aUrlListener, nsnull, aURL); aUrlListener, nsnull, aURL);
@ -906,7 +932,9 @@ nsImapService::DiscoverChildren(nsIEventQueue* aClientEventQueue,
// **** fix me with host specific hierarchySeparator please // **** fix me with host specific hierarchySeparator please
urlSpec.Append("/discoverchildren>/"); urlSpec.Append("/discoverchildren>/");
urlSpec.Append(folderName.GetBuffer()); urlSpec.Append(folderName.GetBuffer());
rv = aImapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(aImapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, rv = GetImapConnectionAndLoadUrl(aClientEventQueue,
aImapUrl, aImapUrl,
@ -955,7 +983,9 @@ nsImapService::DiscoverLevelChildren(nsIEventQueue* aClientEventQueue,
// **** fix me with host specific hierarchySeparator please // **** fix me with host specific hierarchySeparator please
urlSpec.Append("/"); // hierarchySeparator "/" urlSpec.Append("/"); // hierarchySeparator "/"
urlSpec.Append(folderName.GetBuffer()); urlSpec.Append(folderName.GetBuffer());
rv = aImapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(aImapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, rv = GetImapConnectionAndLoadUrl(aClientEventQueue,
aImapUrl, aImapUrl,
@ -1056,7 +1086,9 @@ nsImapService::OnlineMessageCopy(nsIEventQueue* aClientEventQueue,
folderName = ""; folderName = "";
GetFolderName(aDstFolder, folderName); GetFolderName(aDstFolder, folderName);
urlSpec.Append(folderName); urlSpec.Append(folderName);
rv = imapUrl->SetSpec(urlSpec.GetBuffer()); nsCOMPtr <nsIURL> url = do_QueryInterface(imapUrl, &rv);
if (NS_SUCCEEDED(rv) && url)
rv = url->SetSpec(urlSpec.GetBuffer());
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl, rv = GetImapConnectionAndLoadUrl(aClientEventQueue, imapUrl,
aUrlListener, nsnull, aURL); aUrlListener, nsnull, aURL);