Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

return NS_ERROR_NOT_IMPLEMENTED, and not 0. remove dead code. get mark message read working for news. (the m_newSet code isn't being populated from the newsrc file yet, so don't use it.)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@33707 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sspitzer%netscape.com
1999-06-04 03:38:26 +00:00
parent 0fc5625884
commit fade18bee2
3 changed files with 29 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/mailnews/db/msgdb/public/nsNewsDatabase.h
View File

@@ -40,11 +40,14 @@ public:
NS_IMETHOD ForceClosed();
NS_IMETHOD Commit(nsMsgDBCommitType commitType);
virtual PRUint32 GetCurVersion();
// methods to get and set docsets for ids.
NS_IMETHOD MarkHdrRead(nsIMsgDBHdr *msgHdr, PRBool bRead,
nsIDBChangeListener *instigator = NULL);
#if 0
NS_IMETHOD IsRead(nsMsgKey key, PRBool *pRead);
#endif
virtual PRBool IsArticleOffline(nsMsgKey key);
NS_IMETHOD MarkAllRead(nsMsgKeyArray *thoseMarked = NULL);
virtual nsresult AddHdrFromXOver(const char * line, nsMsgKey *msgId);

7
mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
View File

@@ -1088,8 +1088,10 @@ NS_IMETHODIMP nsMsgDatabase::MarkHdrReadInDB(nsIMsgDBHdr *msgHdr, PRBool bRead,
(void)msgHdr->GetMessageKey(&key);
msgHdr->GetFlags(&oldFlags);
SetHdrFlag(msgHdr, bRead, MSG_FLAG_READ);
if (m_newSet)
m_newSet->Remove(key);
if (m_dbFolderInfo != NULL)
{
if (bRead)
@@ -1384,7 +1386,7 @@ NS_IMETHODIMP nsMsgDatabase::MarkLater(nsMsgKey key, time_t *until)
NS_IMETHODIMP nsMsgDatabase::GetMsgKeySet(nsMsgKeySet **pSet)
{
// if it doesn't exist, try to create it
if (m_newSet == nsnull) {
if (!m_newSet) {
m_newSet = nsMsgKeySet::Create();
if (m_newSet == nsnull) {
return NS_ERROR_OUT_OF_MEMORY;
@@ -1397,8 +1399,9 @@ NS_IMETHODIMP nsMsgDatabase::GetMsgKeySet(nsMsgKeySet **pSet)
NS_IMETHODIMP nsMsgDatabase::AddToNewList(nsMsgKey key)
{
if (m_newSet == nsnull)
if (!m_newSet)
m_newSet = nsMsgKeySet::Create();
if (m_newSet)
m_newSet->Add(key);
return (m_newSet) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;

83
mozilla/mailnews/db/msgdb/src/nsNewsDatabase.cpp
View File

@@ -35,7 +35,7 @@ nsNewsDatabase::~nsNewsDatabase()
nsresult nsNewsDatabase::MessageDBOpenUsingURL(const char * groupURL)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP nsNewsDatabase::Open(nsFileSpec &newsgroupName, PRBool create, nsIMsgDatabase** pMessageDB, PRBool upgrading /*=PR_FALSE*/)
@@ -129,18 +129,19 @@ NS_IMETHODIMP nsNewsDatabase::MarkHdrRead(nsIMsgDBHdr *msgHdr, PRBool bRead,
if (NS_FAILED(rv)) {
return rv;
}
if (bRead)
rv = m_newSet->Add(messageKey);
#if 0
if (!bRead)
rv = AddToNewList(messageKey);
else
rv = m_newSet->Remove(messageKey);
#endif
// give parent class chance to update data structures
rv = nsMsgDatabase::MarkHdrRead(msgHdr, bRead, instigator);
return rv;
}
#if 0
NS_IMETHODIMP nsNewsDatabase::IsRead(nsMsgKey key, PRBool *pRead)
{
NS_ASSERTION(pRead != NULL, "null out param in IsRead");
@@ -151,29 +152,30 @@ NS_IMETHODIMP nsNewsDatabase::IsRead(nsMsgKey key, PRBool *pRead)
*pRead = isRead;
return 0;
}
#endif
PRBool nsNewsDatabase::IsArticleOffline(nsMsgKey key)
{
return 0;
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult nsNewsDatabase::MarkAllRead(nsMsgKeyArray *thoseMarked)
{
return 0;
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult nsNewsDatabase::AddHdrFromXOver(const char * line, nsMsgKey *msgId)
{
return 0;
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP nsNewsDatabase::AddHdrToDB(nsMsgHdr *newHdr, PRBool *newThread, PRBool notify)
{
return 0;
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP nsNewsDatabase::ListNextUnread(ListContext **pContext, nsMsgHdr **pResult)
{
return 0;
return NS_ERROR_NOT_IMPLEMENTED;
}
// return highest article number we've seen.
@@ -215,11 +217,11 @@ NS_IMETHODIMP nsNewsDatabase::GetLowWaterArticleNum(nsMsgKey *key)
nsresult nsNewsDatabase::ExpireUpTo(nsMsgKey expireKey)
{
return 0;
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult nsNewsDatabase::ExpireRange(nsMsgKey startRange, nsMsgKey endRange)
{
return 0;
return NS_ERROR_NOT_IMPLEMENTED;
}
nsNewsDatabase *nsNewsDatabase::GetNewsDB()
@@ -234,27 +236,27 @@ PRBool nsNewsDatabase::IsCategory() {
}
nsresult nsNewsDatabase::SetOfflineRetrievalInfo(MSG_RetrieveArtInfo *)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult nsNewsDatabase::SetPurgeHeaderInfo(MSG_PurgeInfo *purgeInfo)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult nsNewsDatabase::SetPurgeArticleInfo(MSG_PurgeInfo *purgeInfo)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult nsNewsDatabase::GetOfflineRetrievalInfo(MSG_RetrieveArtInfo *info)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult nsNewsDatabase::GetPurgeHeaderInfo(MSG_PurgeInfo *purgeInfo)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult nsNewsDatabase::GetPurgeArticleInfo(MSG_PurgeInfo *purgeInfo)
{
return NS_OK;
return NS_ERROR_NOT_IMPLEMENTED;
}
// used to handle filters editing on open news groups.
@@ -284,48 +286,3 @@ nsNewsDatabase::ThreadBySubjectWithoutRe()
return PR_TRUE;
}
#if 0
nsresult
nsNewsDatabase::CreateMsgHdr(nsIMdbRow* hdrRow, nsMsgKey key, nsIMsgDBHdr* *result)
{
nsresult rv;
#ifdef DEBUG_NEWS
printf("nsNewsDatabase::CreateMsgHdr()\n");
#endif
NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
char* msgURI;
//Need to remove ".msf". (msf = message summary file)
nsFileSpec folderPath = path;
char* leafName = folderPath.GetLeafName();
nsString folderName(leafName);
PL_strfree(leafName);
if(folderName.Find(".msf") != -1)
{
nsString realFolderName;
folderName.Left(realFolderName, folderName.Length() - 4);
folderPath.SetLeafName((const nsString)realFolderName);
}
rv = nsBuildNewsMessageURI(folderPath, key, &msgURI);
if (NS_FAILED(rv)) return rv;
nsIRDFResource* res;
rv = rdf->GetResource(msgURI, &res);
PR_smprintf_free(msgURI);
if (NS_FAILED(rv)) return rv;
nsMsgHdr* msgHdr = (nsMsgHdr*)res;
nsMsgHdr* msgHdr = new nsMsgHdr();
msgHdr->Init(this, hdrRow);
msgHdr->SetMessageKey(key);
*result = msgHdr;
return NS_OK;
}
#endif /* 0 */