Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-10 09:19:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix get new msgs, work on unicode folder names

Browse Source
This commit is contained in:
bienvenu%netscape.com 1999-07-02 19:20:54 +00:00
parent ea74b1d18c
commit cb8014d99d
7 changed files with 104 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mailnews/imap/src/nsImapCore.h
View File

@ -152,6 +152,7 @@ struct mailbox_spec {
PRUint32 box_flags;
char *allocatedPathName;
PRUnichar *unicharPathName;
char hierarchySeparator;
const char *hostName;

72
mailnews/imap/src/nsImapMailFolder.cpp
View File

@ -263,8 +263,11 @@ nsresult nsImapMailFolder::AddSubfolder(nsAutoString name,
folder->SetFlag(MSG_FOLDER_FLAG_INBOX);
else if(name == "Trash")
folder->SetFlag(MSG_FOLDER_FLAG_TRASH);
mSubFolders->AppendElement(folder);
nsCOMPtr <nsISupports> supports = do_QueryInterface(folder);
NS_ASSERTION(supports, "couldn't get isupports from imap folder");
if (supports)
mSubFolders->AppendElement(supports);
folder->SetParent(this);
folder->SetDepth(mDepth+1);
*child = folder;
@ -794,6 +797,11 @@ NS_IMETHODIMP nsImapMailFolder::GetHostname(char** hostName)
return NS_ERROR_FAILURE;
while (aName[0] == '/')
aName.Cut(0, 1);
// cut out user name ### alec, when you clean up url parsing, please get this too!
PRInt32 userNameEnd = aName.Find('@');
if (userNameEnd > 0)
aName.Cut(0, userNameEnd + 1);
PRInt32 hostEnd = aName.Find('/');
if (hostEnd > 0) // must have at least one valid charater
aName.SetLength(hostEnd);
@ -1008,7 +1016,15 @@ NS_IMETHODIMP nsImapMailFolder::GetNewMessages()
nsresult rv = NS_ERROR_FAILURE;
NS_WITH_SERVICE(nsIImapService, imapService, kCImapService, &rv);
if (NS_FAILED(rv)) return rv;
rv = imapService->SelectFolder(m_eventQueue, this, this, nsnull);
nsCOMPtr<nsIMsgFolder> inbox;
nsCOMPtr<nsIMsgFolder> rootFolder;
rv = GetRootFolder(getter_AddRefs(rootFolder));
if(NS_SUCCEEDED(rv) && rootFolder)
{
PRUint32 numFolders;
rv = rootFolder->GetFoldersWithFlag(MSG_FOLDER_FLAG_INBOX, getter_AddRefs(inbox), 1, &numFolders);
}
rv = imapService->SelectFolder(m_eventQueue, inbox, this, nsnull);
return rv;
}
@ -1330,13 +1346,31 @@ NS_IMETHODIMP nsImapMailFolder::SetupHeaderParseStream(
#ifdef DOING_FILTERS
if (mFlags & MSG_FOLDER_FLAG_INBOX && !m_filterList)
{
NS_WITH_SERVICE(nsIMsgFilterService, filterService, kMsgFilterServiceCID, &rv);
if (NS_FAILED(rv))
return rv;
NS_WITH_SERVICE(nsIMsgFilterService, filterService, kMsgFilterServiceCID, &rv);
if (NS_SUCCEEDED(rv))
{
// need a file spec for filters...
nsFileSpec filterFile("rules.dat");
nsresult res = filterService->OpenFilterList(&filterFile, getter_AddRefs(m_filterList));
nsCOMPtr <nsIMsgFolder> rootFolder;
rv = GetRootFolder(getter_AddRefs(rootFolder));
if (NS_SUCCEEDED(rv))
{
nsCOMPtr <nsIFileSpec> rootDir;
rv = rootFolder->GetPath(getter_AddRefs(rootDir));
if (NS_SUCCEEDED(rv))
{
nsFileSpec filterFile;
rootDir->GetFileSpec(&filterFile);
// need a file spec for filters...
filterFile += "rules.dat";
nsresult res = filterService->OpenFilterList(&filterFile, getter_AddRefs(m_filterList));
}
}
}
}
#endif
@ -1416,7 +1450,7 @@ NS_IMETHODIMP nsImapMailFolder::NormalEndHeaderParseStream(nsIImapProtocol*
if (NS_SUCCEEDED(rv) && headers)
{
#ifdef DOING_FILTERS
m_filterList->ApplyFiltersToHdr(nsMsgFilterInboxRule, newMsgHdr, this, mDatabase,
m_filterList->ApplyFiltersToHdr(nsMsgFilterType::InboxRule, newMsgHdr, this, mDatabase,
headers, headersSize, this);
#endif
}
@ -1528,7 +1562,7 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, PRBool *app
PRBool isRead = (msgFlags & MSG_FLAG_READ);
switch (actionType)
{
case nsMsgFilterActionDelete:
case nsMsgFilterAction::Delete:
{
PRBool deleteToTrash = DeleteIsMoveToTrash();
PRBool showDeletedMessages = ShowDeletedMessages();
@ -1541,7 +1575,7 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, PRBool *app
{
// this sucks - but we need value to live past this scope
// so we use an nsString from above.
char *folderName = nsnull;
PRUnichar *folderName = nsnull;
rv = mailTrash->GetName(&folderName);
trashNameVal = folderName;
PR_FREEIF(folderName);
@ -1563,13 +1597,13 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, PRBool *app
}
}
// note that delete falls through to move.
case nsMsgFilterActionMoveToFolder:
case nsMsgFilterAction::MoveToFolder:
{
// if moving to a different file, do it.
char *folderName = nsnull;
PRUnichar *folderName = nsnull;
rv = GetName(&folderName);
if (value && PL_strcasecmp(folderName, (char *) value))
if (value && nsCRT::strcasecmp(folderName, (char *) value))
{
PRUint32 msgFlags;
msgHdr->GetFlags(&msgFlags);
@ -1624,7 +1658,7 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, PRBool *app
delete [] folderName;
}
break;
case nsMsgFilterActionMarkRead:
case nsMsgFilterAction::MarkRead:
{
nsMsgKeyArray keysToFlag;
@ -1633,17 +1667,17 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, PRBool *app
}
// MarkFilteredMessageRead(msgHdr);
break;
case nsMsgFilterActionKillThread:
case nsMsgFilterAction::KillThread:
// for ignore and watch, we will need the db
// to check for the flags in msgHdr's that
// get added, because only then will we know
// the thread they're getting added to.
msgHdr->OrFlags(MSG_FLAG_IGNORED, &newFlags);
break;
case nsMsgFilterActionWatchThread:
case nsMsgFilterAction::WatchThread:
msgHdr->OrFlags(MSG_FLAG_WATCHED, &newFlags);
break;
case nsMsgFilterActionChangePriority:
case nsMsgFilterAction::ChangePriority:
msgHdr->SetPriority(*(nsMsgPriority *) &value);
break;
default:

2
mailnews/imap/src/nsImapMailFolder.h
View File

@ -32,7 +32,7 @@
#include "nsITransactionManager.h"
#include "nsMsgTxn.h"
#ifdef DEBUG_bienvenu
//#define DOING_FILTERS
#define DOING_FILTERS
#endif
#ifdef DOING_FILTERS
#include "nsIMsgFilterHitNotify.h"

54
mailnews/imap/src/nsImapProtocol.cpp
View File

@ -3713,18 +3713,6 @@ nsImapProtocol::CreateUtf7ConvertedString(const char * aSourceString,
nsresult res;
char *dstPtr = nsnull;
PRInt32 dstLength = 0;
// this seems to work, but we'll leave this for a little while in in case we
// need to disable it
static PRBool tryCharsetConversion = PR_TRUE;
// ***** temporary **** Fix me ****
if (!tryCharsetConversion)
{
if (aSourceString)
return PL_strdup(aSourceString);
else
return nsnull;
}
// we haven't turned this code on yet - we're working on it.
char *convertedString = NULL;
NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res);
@ -3799,6 +3787,48 @@ nsImapProtocol::CreateUtf7ConvertedString(const char * aSourceString,
return convertedString;
}
PRUnichar * nsImapProtocol::CreatePRUnicharStringFromUTF7(const char * aSourceString)
{
PRUnichar *convertedString = NULL;
nsresult res;
NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res);
if(NS_SUCCEEDED(res) && (nsnull != ccm))
{
nsString aCharset("x-imap4-modified-utf7");
PRUnichar *unichars = nsnull;
PRInt32 unicharLength;
// convert utf7 to unicode
nsIUnicodeDecoder* decoder = nsnull;
res = ccm->GetUnicodeDecoder(&aCharset, &decoder);
if(NS_SUCCEEDED(res) && (nsnull != decoder))
{
PRInt32 srcLen = PL_strlen(aSourceString);
res = decoder->Length(aSourceString, 0, srcLen, &unicharLength);
// temporary buffer to hold unicode string
unichars = new PRUnichar[unicharLength + 1];
if (unichars == nsnull)
{
res = NS_ERROR_OUT_OF_MEMORY;
}
else
{
res = decoder->Convert(unichars, 0, &unicharLength, aSourceString, 0, &srcLen);
unichars[unicharLength] = 0;
}
NS_IF_RELEASE(decoder);
// convert the unicode to 8 bit ascii.
nsString2 unicodeStr(unichars);
convertedString = unicodeStr.ToNewUnicode();
}
}
return convertedString;
}
// imap commands issued by the parser
void
nsImapProtocol::Store(nsString2 &messageList, const char * messageData,

2
mailnews/imap/src/nsImapProtocol.h
View File

@ -208,6 +208,8 @@ public:
char * CreateUtf7ConvertedString(const char * aSourceString, PRBool
aConvertToUtf7Imap);
PRUnichar * CreatePRUnicharStringFromUTF7(const char * aSourceString);
void Copy(nsString2 &messageList, const char *destinationMailbox,
PRBool idsAreUid);
void Search(nsString2 &searchCriteria, PRBool useUID,

1
mailnews/imap/src/nsImapServerResponseParser.cpp
View File

@ -845,6 +845,7 @@ void nsImapServerResponseParser::mailbox(mailbox_spec *boxSpec)
char *convertedName =
fServerConnection.CreateUtf7ConvertedString(boxname, PR_FALSE);
PRUnichar *unicharName = fServerConnection.CreatePRUnicharStringFromUTF7(boxname);
PL_strfree(boxname);
boxname = convertedName;
}

9
mailnews/imap/src/nsImapUrl.cpp
View File

@ -860,7 +860,9 @@ NS_IMETHODIMP nsImapUrl::AllocateServerPath(const char * canonicalPath, char onl
return retVal;
}
// Converts the real online name on the server to canonical format:
// result is hierarchy is indicated by '/' and all real slashes ('/') are escaped.
// The caller has already converted m-utf-7 to 8 bit ascii, which is a problem.
NS_IMETHODIMP nsImapUrl::AllocateCanonicalPath(const char *serverPath, char onlineDelimiter, char **allocatedPath )
{
nsresult rv = NS_ERROR_NULL_POINTER;
@ -885,12 +887,9 @@ NS_IMETHODIMP nsImapUrl::AllocateCanonicalPath(const char *serverPath, char onli
NS_ASSERTION (serverPath, "Oops... null serverPath");
if (!serverPath)
if (!serverPath || NS_FAILED(rv))
goto done;
if (NS_FAILED(rv))
goto done;
GetHost(&hostName);
m_server->GetUsername(&userName);