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

Bug #257990 --> mark spam as read is now a global otpion and not account specific. sr=bienvenu

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@198043 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org
2006-05-19 21:28:56 +00:00
parent 1b0416113c
commit 4d65c3e2ad
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/mailnews/base/public/nsISpamSettings.idl
View File

@@ -53,7 +53,7 @@ interface nsISpamSettings: nsISupports {
attribute long level;
attribute boolean moveOnSpam;
attribute boolean markAsReadOnSpam;
readonly attribute boolean markAsReadOnSpam;
/**
* Most consumers will just use spamFolderURI rather than accessing any of

22
mozilla/mailnews/base/src/nsSpamSettings.cpp
View File

@@ -61,7 +61,6 @@ nsSpamSettings::nsSpamSettings()
{
mLevel = 0;
mMoveOnSpam = PR_FALSE;
mMarkAsReadOnSpam = PR_FALSE;
mMoveTargetMode = nsISpamSettings::MOVE_TARGET_MODE_ACCOUNT;
mPurge = PR_FALSE;
mPurgeInterval = 14; // 14 days
@@ -69,9 +68,7 @@ nsSpamSettings::nsSpamSettings()
mServerFilterTrustFlags = 0;
mUseWhiteList = PR_FALSE;
mManualMark = PR_FALSE;
mUseServerFilter = PR_FALSE;
mManualMarkMode = nsISpamSettings::MANUAL_MARK_MODE_MOVE;
nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(mLogFile));
if (NS_SUCCEEDED(rv))
@@ -141,8 +138,16 @@ NS_IMETHODIMP nsSpamSettings::GetLoggingEnabled(PRBool *aLoggingEnabled)
return prefBranch->GetBoolPref("mail.spam.logging.enabled", aLoggingEnabled);
}
NS_IMETHODIMP nsSpamSettings::GetMarkAsReadOnSpam(PRBool *aMarkAsReadOnSpam)
{
NS_ENSURE_ARG_POINTER(aMarkAsReadOnSpam);
nsresult rv;
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
return prefBranch->GetBoolPref("mail.spam.markAsReadOnSpam", aMarkAsReadOnSpam);
}
NS_IMPL_GETSET(nsSpamSettings, MoveOnSpam, PRBool, mMoveOnSpam)
NS_IMPL_GETSET(nsSpamSettings, MarkAsReadOnSpam, PRBool, mMarkAsReadOnSpam)
NS_IMPL_GETSET(nsSpamSettings, Purge, PRBool, mPurge)
NS_IMPL_GETSET(nsSpamSettings, UseWhiteList, PRBool, mUseWhiteList)
NS_IMPL_GETSET(nsSpamSettings, UseServerFilter, PRBool, mUseServerFilter)
@@ -252,12 +257,6 @@ NS_IMETHODIMP nsSpamSettings::Initialize(nsIMsgIncomingServer *aServer)
rv = SetMoveOnSpam(moveOnSpam);
NS_ENSURE_SUCCESS(rv, rv);
PRBool markAsReadOnSpam;
rv = aServer->GetBoolValue("markAsReadOnSpam", &markAsReadOnSpam);
NS_ENSURE_SUCCESS(rv, rv);
rv = SetMarkAsReadOnSpam(markAsReadOnSpam);
NS_ENSURE_SUCCESS(rv, rv);
PRInt32 moveTargetMode;
rv = aServer->GetIntValue("moveTargetMode", &moveTargetMode);
NS_ENSURE_SUCCESS(rv, rv);
@@ -366,9 +365,6 @@ NS_IMETHODIMP nsSpamSettings::Clone(nsISpamSettings *aSpamSettings)
NS_ENSURE_SUCCESS(rv,rv);
(void)aSpamSettings->GetMoveOnSpam(&mMoveOnSpam);
(void)aSpamSettings->GetMarkAsReadOnSpam(&mMarkAsReadOnSpam);
(void)aSpamSettings->GetManualMark(&mManualMark);
(void)aSpamSettings->GetManualMarkMode(&mManualMarkMode);
(void)aSpamSettings->GetPurge(&mPurge);
(void)aSpamSettings->GetUseServerFilter(&mUseServerFilter);

3
mozilla/mailnews/base/src/nsSpamSettings.h
View File

@@ -62,16 +62,13 @@ private:
nsCOMPtr <nsIOutputStream> mLogStream;
nsCOMPtr<nsIFile> mLogFile;
PRInt32 mManualMarkMode;
PRInt32 mLevel;
PRInt32 mPurgeInterval;
PRInt32 mMoveTargetMode;
PRBool mManualMark;
PRBool mPurge;
PRBool mUseWhiteList;
PRBool mMoveOnSpam;
PRBool mMarkAsReadOnSpam;
PRBool mUseServerFilter;
nsCString mActionTargetAccount;