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

Bug #31058 -->Add nsIMsgI18NUrl and Get/Set URI support. 

set the URI for the imap url if we have one.
This commit is contained in:
mscott%netscape.com 2000-05-15 20:34:54 +00:00
Родитель 617ab9fdd9
Коммит 96ffe5e9c2
4 изменённых файлов: 104 добавлений и 59 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -145,7 +145,7 @@ NS_IMETHODIMP
nsImapService::SelectFolder(nsIEventQueue * aClientEventQueue,
nsIMsgFolder * aImapMailFolder,
nsIUrlListener * aUrlListener,
nsIMsgWindow *aMsgWindow,
nsIMsgWindow *aMsgWindow,
nsIURI ** aURL)
{
@ -167,7 +167,7 @@ nsImapService::SelectFolder(nsIEventQueue * aClientEventQueue,
nsCAutoString urlSpec;
nsresult rv;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), aImapMailFolder, aUrlListener, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), aImapMailFolder, aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv) && imapUrl)
{
@ -222,7 +222,7 @@ nsImapService::LiteSelectFolder(nsIEventQueue * aClientEventQueue,
nsresult rv;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), aImapMailFolder, aUrlListener, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), aImapMailFolder, aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv))
{
@ -263,7 +263,7 @@ NS_IMETHODIMP nsImapService::GetUrlForUri(const char *aMessageURI, nsIURI **aURL
nsCOMPtr<nsIImapUrl> imapUrl;
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(folder);;
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), folder, nsnull, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(aMessageURI, getter_AddRefs(imapUrl), folder, nsnull, urlSpec, hierarchySeparator);
if (NS_FAILED(rv)) return rv;
imapUrl->SetImapMessageSink(imapMessageSink);
@ -355,7 +355,7 @@ NS_IMETHODIMP nsImapService::DisplayMessage(const char* aMessageURI,
nsCOMPtr<nsIImapUrl> imapUrl;
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(folder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), folder, aUrlListener, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(aMessageURI, getter_AddRefs(imapUrl), folder, aUrlListener, urlSpec, hierarchySeparator);
if (NS_FAILED(rv))
return rv;
if (mimePart)
@ -551,7 +551,7 @@ nsImapService::CopyMessage(const char * aSrcMailboxURI, nsIStreamListener *
nsCOMPtr<nsIImapUrl> imapUrl;
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(folder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), folder, aUrlListener, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(aSrcMailboxURI, getter_AddRefs(imapUrl), folder, aUrlListener, urlSpec, hierarchySeparator);
// now try to download the message
nsImapAction imapAction = nsIImapUrl::nsImapOnlineToOfflineCopy;
@ -613,7 +613,7 @@ nsImapService::CopyMessages(nsMsgKeyArray *keys, nsIMsgFolder *srcFolder, nsIStr
nsCOMPtr<nsIImapUrl> imapUrl;
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(folder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), folder, aUrlListener, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), folder, aUrlListener, urlSpec, hierarchySeparator);
nsImapAction action;
if (moveMessage)
action = nsIImapUrl::nsImapOnlineToOfflineMove;
@ -638,7 +638,7 @@ NS_IMETHODIMP nsImapService::Search(nsIMsgSearchSession *aSearchSession, nsIMsgW
nsCOMPtr<nsIImapUrl> imapUrl;
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aMsgFolder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), aMsgFolder, nsnull, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), aMsgFolder, nsnull, urlSpec, hierarchySeparator);
if (NS_FAILED(rv))
return rv;
nsCOMPtr<nsIMsgMailNewsUrl> msgurl (do_QueryInterface(imapUrl));
@ -722,7 +722,7 @@ NS_IMETHODIMP nsImapService::SaveMessageToDisk(const char *aMessageURI,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(folder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), folder, aUrlListener, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(aMessageURI, getter_AddRefs(imapUrl), folder, aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv))
{
nsCOMPtr<nsIImapMessageSink> imapMessageSink(do_QueryInterface(folder, &rv));
@ -862,11 +862,11 @@ nsImapService::FetchMessage(nsIImapUrl * aImapUrl,
}
nsresult
nsImapService::CreateStartOfImapUrl(nsIImapUrl ** imapUrl,
nsImapService::CreateStartOfImapUrl(const char * aImapURI, nsIImapUrl ** imapUrl,
nsIMsgFolder* aImapMailFolder,
nsIUrlListener * aUrlListener,
nsCString & urlSpec,
PRUnichar &hierarchyDelimiter)
PRUnichar &hierarchyDelimiter)
{
nsresult rv = NS_OK;
char *hostname = nsnull;
@ -894,15 +894,17 @@ nsImapService::CreateStartOfImapUrl(nsIImapUrl ** imapUrl,
}
// now we need to create an imap url to load into the connection. The url
// needs to represent a select folder action.
// needs to represent a select folder action.
rv = nsComponentManager::CreateInstance(kImapUrlCID, nsnull,
NS_GET_IID(nsIImapUrl), (void **)
imapUrl);
NS_GET_IID(nsIImapUrl), (void **)
imapUrl);
if (NS_SUCCEEDED(rv) && imapUrl)
{
{
nsCOMPtr<nsIMsgMailNewsUrl> mailnewsUrl = do_QueryInterface(*imapUrl, &rv);
if (NS_SUCCEEDED(rv) && mailnewsUrl && aUrlListener)
mailnewsUrl->RegisterListener(aUrlListener);
nsCOMPtr<nsIMsgMessageUrl> msgurl(do_QueryInterface(*imapUrl));
msgurl->SetUri(aImapURI);
urlSpec = "imap://";
urlSpec.Append((const char *) escapedUsername);
@ -923,9 +925,9 @@ nsImapService::CreateStartOfImapUrl(nsIImapUrl ** imapUrl,
nsCOMPtr <nsIMsgImapMailFolder> imapFolder = do_QueryInterface(aImapMailFolder);
if (imapFolder)
imapFolder->GetHierarchyDelimiter(&hierarchyDelimiter);
}
}
PR_FREEIF(hostname);
PR_FREEIF(hostname);
return rv;
}
@ -953,7 +955,7 @@ nsImapService::GetHeaders(nsIEventQueue * aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
nsresult rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl),aImapMailFolder, aUrlListener, urlSpec, hierarchySeparator);
nsresult rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl),aImapMailFolder, aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv) && imapUrl)
{
nsCOMPtr<nsIURI> uri = do_QueryInterface(imapUrl);
@ -1003,7 +1005,7 @@ nsImapService::Noop(nsIEventQueue * aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
nsresult rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl),
nsresult rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl),
aImapMailFolder,
aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv) && imapUrl)
@ -1047,7 +1049,7 @@ nsImapService::Expunge(nsIEventQueue * aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
nsresult rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl),
nsresult rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl),
aImapMailFolder,
aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv))
@ -1096,7 +1098,7 @@ nsImapService::Biff(nsIEventQueue * aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
nsresult rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl),
nsresult rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl),
aImapMailFolder,
aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv) && imapUrl)
@ -1142,7 +1144,7 @@ nsImapService::DeleteFolder(nsIEventQueue* eventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(folder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), folder, urlListener, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), folder, urlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv))
{
rv = SetImapUrlSink(folder, imapUrl);
@ -1193,7 +1195,7 @@ nsImapService::DeleteMessages(nsIEventQueue * aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
nsresult rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl),
nsresult rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl),
aImapMailFolder,
aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv) && imapUrl)
@ -1243,7 +1245,7 @@ nsImapService::DeleteAllMessages(nsIEventQueue * aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
nsresult rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl),
nsresult rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl),
aImapMailFolder,
aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv))
@ -1334,7 +1336,7 @@ nsresult nsImapService::DiddleFlags(nsIEventQueue * aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
nsresult rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl),
nsresult rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl),
aImapMailFolder,
aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv) && imapUrl)
@ -1436,7 +1438,7 @@ nsImapService::DiscoverAllFolders(nsIEventQueue* aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
nsresult rv = CreateStartOfImapUrl(getter_AddRefs(aImapUrl),
nsresult rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(aImapUrl),
aImapMailFolder,
aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED (rv))
@ -1473,7 +1475,7 @@ nsImapService::DiscoverAllAndSubscribedFolders(nsIEventQueue* aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
nsresult rv = CreateStartOfImapUrl(getter_AddRefs(aImapUrl),
nsresult rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(aImapUrl),
aImapMailFolder,
aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED (rv) && aImapUrl)
@ -1509,7 +1511,7 @@ nsImapService::DiscoverChildren(nsIEventQueue* aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
nsresult rv = CreateStartOfImapUrl(getter_AddRefs(aImapUrl),
nsresult rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(aImapUrl),
aImapMailFolder,
aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED (rv))
@ -1561,7 +1563,7 @@ nsImapService::DiscoverLevelChildren(nsIEventQueue* aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
nsresult rv = CreateStartOfImapUrl(getter_AddRefs(aImapUrl),
nsresult rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(aImapUrl),
aImapMailFolder,aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED (rv) && aImapUrl)
{
@ -1633,7 +1635,7 @@ nsImapService::OnlineMessageCopy(nsIEventQueue* aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aSrcFolder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), aSrcFolder, aUrlListener, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), aSrcFolder, aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv))
{
SetImapUrlSink(aSrcFolder, imapUrl);
@ -1693,7 +1695,7 @@ nsImapService::AppendMessageFromFile(nsIEventQueue* aClientEventQueue,
nsCAutoString urlSpec;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aDstFolder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), aDstFolder, aListener, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), aDstFolder, aListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv))
{
SetImapUrlSink(aDstFolder, imapUrl);
@ -1796,7 +1798,7 @@ nsImapService::MoveFolder(nsIEventQueue* eventQueue, nsIMsgFolder* srcFolder,
nsresult rv;
PRUnichar default_hierarchySeparator = GetHierarchyDelimiter(dstFolder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), dstFolder, urlListener, urlSpec, default_hierarchySeparator);
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), dstFolder, urlListener, urlSpec, default_hierarchySeparator);
if (NS_SUCCEEDED(rv) && imapUrl)
{
rv = SetImapUrlSink(dstFolder, imapUrl);
@ -1844,7 +1846,7 @@ nsImapService::RenameLeaf(nsIEventQueue* eventQueue, nsIMsgFolder* srcFolder,
nsresult rv;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(srcFolder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), srcFolder, urlListener, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), srcFolder, urlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv))
{
rv = SetImapUrlSink(srcFolder, imapUrl);
@ -1902,7 +1904,7 @@ nsImapService::CreateFolder(nsIEventQueue* eventQueue, nsIMsgFolder* parent,
nsresult rv;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(parent);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), parent, urlListener, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), parent, urlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv) && imapUrl)
{
rv = SetImapUrlSink(parent, imapUrl);
@ -1951,7 +1953,7 @@ nsImapService::ListFolder(nsIEventQueue* aClientEventQueue,
nsresult rv;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), aImapMailFolder, aUrlListener, urlSpec, hierarchySeparator);
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), aImapMailFolder, aUrlListener, urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv) && imapUrl)
{
rv = SetImapUrlSink(aImapMailFolder, imapUrl);
@ -2799,7 +2801,7 @@ nsImapService::SubscribeFolder(nsIEventQueue* eventQueue,
nsCAutoString urlSpec;
nsresult rv;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aFolder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), aFolder, urlListener,
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), aFolder, urlListener,
urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv) && imapUrl)
{
@ -2838,7 +2840,7 @@ nsImapService::UnsubscribeFolder(nsIEventQueue* eventQueue,
nsCAutoString urlSpec;
nsresult rv;
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aFolder);
rv = CreateStartOfImapUrl(getter_AddRefs(imapUrl), aFolder, urlListener,
rv = CreateStartOfImapUrl(nsnull, getter_AddRefs(imapUrl), aFolder, urlListener,
urlSpec, hierarchySeparator);
if (NS_SUCCEEDED(rv) && imapUrl)
{

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

@ -69,11 +69,12 @@ protected:
PRUnichar GetHierarchyDelimiter(nsIMsgFolder* aMsgFolder);
nsresult GetFolderName(nsIMsgFolder* aImapFolder,
char **folderName);
nsresult CreateStartOfImapUrl(nsIImapUrl **imapUrl,
nsresult CreateStartOfImapUrl(const char * aImapURI /* a RDF URI for the current message / folder, can be null */,
nsIImapUrl **imapUrl,
nsIMsgFolder* aImapFolder,
nsIUrlListener * aUrlListener,
nsCString & urlSpec,
PRUnichar &hierarchyDelimiter);
PRUnichar &hierarchyDelimiter);
nsresult GetImapConnectionAndLoadUrl(nsIEventQueue* aClientEventQueue,
nsIImapUrl* aImapUrl,
nsISupports* aConsumer,

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

@ -43,6 +43,13 @@
#include "nsAutoLock.h"
#include "nsIMAPNamespace.h"
// rdf stuff is needed to get the charset from the imap folder associated with the url.
#include "nsIRDFService.h"
#include "rdf.h"
#include "nsIMsgFolder.h"
#include "nsIMessage.h"
static NS_DEFINE_CID(kCImapMockChannel, NS_IMAPMOCKCHANNEL_CID);
static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID);
static NS_DEFINE_CID(kCImapHostSessionListCID, NS_IIMAPHOSTSESSIONLIST_CID);
@ -101,6 +108,7 @@ NS_IMPL_RELEASE_INHERITED(nsImapUrl, nsMsgMailNewsUrl)
NS_INTERFACE_MAP_BEGIN(nsImapUrl)
NS_INTERFACE_MAP_ENTRY(nsIImapUrl)
NS_INTERFACE_MAP_ENTRY(nsIMsgMessageUrl)
NS_INTERFACE_MAP_ENTRY(nsIMsgI18NUrl)
NS_INTERFACE_MAP_END_INHERITING(nsMsgMailNewsUrl)
////////////////////////////////////////////////////////////////////////////////////
@ -207,8 +215,8 @@ NS_IMETHODIMP nsImapUrl::GetImapExtensionSink(nsIImapExtensionSink ** aImapExten
NS_IMETHODIMP nsImapUrl::SetImapExtensionSink(nsIImapExtensionSink * aImapExtensionSink)
{
// ** jt - not ref counted; talk to me before you change the code
m_imapExtensionSink = aImapExtensionSink;
// ** jt - not ref counted; talk to me before you change the code
m_imapExtensionSink = aImapExtensionSink;
return NS_OK;
}
@ -228,9 +236,8 @@ NS_IMETHODIMP nsImapUrl::GetImapMiscellaneousSink(nsIImapMiscellaneousSink **
NS_IMETHODIMP nsImapUrl::SetImapMiscellaneousSink(nsIImapMiscellaneousSink *
aImapMiscellaneousSink)
{
// ** jt - not ref counted; talk to me before you change the code
m_imapMiscellaneousSink = aImapMiscellaneousSink;
// ** jt - not ref counted; talk to me before you change the code
m_imapMiscellaneousSink = aImapMiscellaneousSink;
return NS_OK;
}
@ -1010,12 +1017,19 @@ NS_IMETHODIMP nsImapUrl::GetAllowContentChange(PRBool *result)
return NS_OK;
}
NS_IMETHODIMP
nsImapUrl::GetURI(char** aURI)
NS_IMETHODIMP nsImapUrl::SetUri(const char * aURI)
{
nsresult rv = NS_ERROR_NULL_POINTER;
if (aURI)
{
mURI= aURI;
return NS_OK;
}
NS_IMETHODIMP nsImapUrl::GetUri(char** aURI)
{
nsresult rv = NS_OK;
if (!mURI.IsEmpty())
*aURI = mURI.ToNewCString();
else
{
*aURI = nsnull;
PRUint32 key = m_listOfMessageIds ? atoi(m_listOfMessageIds) : 0;
nsXPIDLCString theFile;
@ -1029,15 +1043,13 @@ nsImapUrl::GetURI(char** aURI)
fullFolderPath += '/';
fullFolderPath.Append(theFile);
PR_FREEIF(hostName);
char * baseMessageURI;
nsCreateImapBaseMessageURI(fullFolderPath, &baseMessageURI);
nsCAutoString uriStr;
rv = nsBuildImapMessageURI(baseMessageURI, key, uriStr);
nsCRT::free(baseMessageURI);
*aURI = uriStr.ToNewCString();
return rv;
PR_FREEIF(hostName);
char * baseMessageURI;
nsCreateImapBaseMessageURI(fullFolderPath, &baseMessageURI);
nsCAutoString uriStr;
rv = nsBuildImapMessageURI(baseMessageURI, key, uriStr);
nsCRT::free(baseMessageURI);
*aURI = uriStr.ToNewCString();
}
return rv;
@ -1238,3 +1250,30 @@ void nsImapUrl::ParseListOfMessageIds()
}
}
// nsIMsgI18NUrl support
NS_IMETHODIMP nsImapUrl::GetFolderCharset(PRUnichar ** aCharacterSet)
{
// if we have a RDF URI, then try to get the folder for that URI and then ask the folder
// for it's charset....
nsXPIDLCString uri;
GetUri(getter_Copies(uri));
NS_ENSURE_TRUE(uri, NS_ERROR_FAILURE);
nsCOMPtr<nsIRDFService> rdfService = do_GetService(NS_RDF_PROGID "/rdf-service");
nsCOMPtr<nsIRDFResource> resource;
rdfService->GetResource(uri, getter_AddRefs(resource));
NS_ENSURE_TRUE(resource, NS_ERROR_FAILURE);
nsCOMPtr<nsIMessage> msg (do_QueryInterface(resource));
NS_ENSURE_TRUE(msg, NS_ERROR_FAILURE);
nsCOMPtr<nsIMsgFolder> folder;
msg->GetMsgFolder(getter_AddRefs(folder));
NS_ENSURE_TRUE(folder, NS_ERROR_FAILURE);
nsXPIDLString charset;
folder->GetCharset(getter_Copies(charset));
*aCharacterSet = nsCRT::strdup(charset);
return NS_OK;
}

5
mailnews/imap/src/nsImapUrl.h
Просмотреть файл

@ -36,7 +36,7 @@
#include "nsXPIDLString.h"
class nsImapUrl : public nsIImapUrl, public nsMsgMailNewsUrl, public nsIMsgMessageUrl
class nsImapUrl : public nsIImapUrl, public nsMsgMailNewsUrl, public nsIMsgMessageUrl, public nsIMsgI18NUrl
{
public:
@ -55,6 +55,7 @@ public:
// nsIMsgMessageUrl
NS_DECL_NSIMSGMESSAGEURL
NS_DECL_NSIMSGI18NURL
// nsImapUrl
nsImapUrl();
@ -120,6 +121,8 @@ protected:
nsCOMPtr<nsIFileSpec> m_messageFileSpec;
PRBool m_addDummyEnvelope;
PRBool m_canonicalLineEnding; // CRLF
nsCString mURI; // the RDF URI associated with this url.
};
#endif /* nsImapUrl_h___ */