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

Correct signatures for several functions on the imap folder. They weren't matching up with the base class signatures (GetSize, GetPrettyName and RememberPassword). Quiet some compiler warnings.

This commit is contained in:
mscott%netscape.com 1999-05-07 21:18:06 +00:00
Родитель 2dfa55c53c
Коммит 92bc5ed6e0
2 изменённых файлов: 9 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -699,12 +699,12 @@ NS_IMETHODIMP nsImapMailFolder::GetName(char ** name)
return NS_OK;
}
NS_IMETHODIMP nsImapMailFolder::GetPrettyName(nsString& prettyName)
NS_IMETHODIMP nsImapMailFolder::GetPrettyName(char ** prettyName)
{
if (mDepth == 1) {
char *hostName = nsnull;
GetHostName(&hostName);
prettyName = PL_strdup(hostName);
*prettyName = PL_strdup(hostName);
PR_FREEIF(hostName);
}
else {
@ -765,7 +765,7 @@ NS_IMETHODIMP nsImapMailFolder::GetRequiresCleanup(PRBool *requiresCleanup)
}
NS_IMETHODIMP nsImapMailFolder::GetSizeOnDisk(PRUint32 size)
NS_IMETHODIMP nsImapMailFolder::GetSizeOnDisk(PRUint32 * size)
{
nsresult rv = NS_ERROR_FAILURE;
return rv;
@ -866,7 +866,7 @@ NS_IMETHODIMP nsImapMailFolder::UserNeedsToAuthenticateForFolder(PRBool
return rv;
}
NS_IMETHODIMP nsImapMailFolder::RememberPassword(char *password)
NS_IMETHODIMP nsImapMailFolder::RememberPassword(const char *password)
{
nsresult rv = NS_ERROR_FAILURE;
return rv;
@ -1120,11 +1120,9 @@ NS_IMETHODIMP nsImapMailFolder::UpdateImapMailboxInfo(
{
PRUint32 total;
PRBool highWaterDeleted = FALSE;
// It would be nice to notify RDF or whoever of a mass delete here.
m_mailDatabase->DeleteMessages(&keysToDelete,NULL);
total = keysToDelete.GetSize();
nsMsgKey highWaterMark = nsMsgKey_None;
}
if (keysToFetch.GetSize())
{
@ -1506,7 +1504,7 @@ void nsImapMailFolder::PrepareToAddHeadersToMailDB(nsIImapProtocol* aProtocol, c
{
PRUint32 total = keysToFetch.GetSize();
for (int keyIndex=0; keyIndex < total; keyIndex++)
for (PRUint32 keyIndex=0; keyIndex < total; keyIndex++)
theKeys[keyIndex] = keysToFetch[keyIndex];
// m_DownLoadState = kDownLoadingAllMessageHeaders;
@ -1586,7 +1584,7 @@ void nsImapMailFolder::TweakHeaderFlags(nsIImapProtocol* aProtocol, nsIMsgDBHdr
MSG_FLAG_NEW => do nothing, leave kMDNNeeded on
*/
PRUint16 userFlags;
nsresult res = aProtocol->GetSupportedUserFlags(&userFlags);
res = aProtocol->GetSupportedUserFlags(&userFlags);
if (NS_SUCCEEDED(res) && (userFlags & (kImapMsgSupportUserFlag |
kImapMsgSupportMDNSentFlag)))
{

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

@ -80,7 +80,7 @@ public:
// this override pulls the value from the db
NS_IMETHOD GetName(char ** name); // Name of this folder (as presented to user).
NS_IMETHOD GetPrettyName(nsString& prettyName); // Override of the base, for top-level mail folder
NS_IMETHOD GetPrettyName(char ** prettyName); // Override of the base, for top-level mail folder
NS_IMETHOD BuildFolderURL(char **url);
@ -92,12 +92,12 @@ public:
NS_IMETHOD GetCanBeRenamed (PRBool *canBeRenamed);
NS_IMETHOD GetRequiresCleanup(PRBool *requiresCleanup);
NS_IMETHOD GetSizeOnDisk(PRUint32 size);
NS_IMETHOD GetSizeOnDisk(PRUint32 * size);
NS_IMETHOD GetUsersName(char** userName);
NS_IMETHOD GetHostName(char** hostName);
NS_IMETHOD UserNeedsToAuthenticateForFolder(PRBool displayOnly, PRBool *authenticate);
NS_IMETHOD RememberPassword(char *password);
NS_IMETHOD RememberPassword(const char *password);
NS_IMETHOD GetRememberedPassword(char ** password);
virtual nsresult GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo,