Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv26422/src/gui
Modified Files:
wxFiltersDialog.cpp wxOptionsDlg.cpp wxSpamOptions.cpp
Log Message:
Simple whitelist support
Index: wxFiltersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFiltersDialog.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -b -u -2 -r1.110 -r1.111
--- wxFiltersDialog.cpp 19 Sep 2003 13:31:21 -0000 1.110
+++ wxFiltersDialog.cpp 26 Sep 2003 09:33:43 -0000 1.111
@@ -46,6 +46,4 @@
#include "MModule.h"
-#include "MFilterLang.h" // for SPAM_TEST_XXX constants
-
#include "gui/wxBrowseButton.h"
#include "gui/wxDialogLayout.h"
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.385
retrieving revision 1.386
diff -b -u -2 -r1.385 -r1.386
--- wxOptionsDlg.cpp 22 Sep 2003 23:49:43 -0000 1.385
+++ wxOptionsDlg.cpp 26 Sep 2003 09:33:44 -0000 1.386
@@ -456,4 +456,5 @@
ConfigField_AutoCollectSenderOnly,
ConfigField_AutoCollectNameless,
+ ConfigField_WhiteList,
#ifdef USE_BBDB
ConfigField_Bbdb_HelpText,
@@ -464,5 +465,5 @@
ConfigField_AdbLast = ConfigField_Bbdb_SaveOnExit,
#else // !USE_BBDB
- ConfigField_AdbLast = ConfigField_AutoCollectNameless,
+ ConfigField_AdbLast = ConfigField_WhiteList,
#endif // USE_BBDB/!USE_BBDB
@@ -1524,4 +1525,5 @@
{ gettext_noop("Autocollect only &senders' addresses"), Field_Bool,
ConfigField_AutoCollect},
{ gettext_noop("Ignore addresses without &names"), Field_Bool,
ConfigField_AutoCollect},
+ { gettext_noop("&Whitelist"), Field_Text | Field_AppWide, -1 },
#ifdef USE_BBDB
{ gettext_noop("The following settings configure the support of the Big Brother\n"
@@ -1999,4 +2001,5 @@
CONFIG_ENTRY(MP_AUTOCOLLECT_SENDER),
CONFIG_ENTRY(MP_AUTOCOLLECT_NAMED),
+ CONFIG_ENTRY(MP_WHITE_LIST),
#ifdef USE_BBDB
CONFIG_NONE(),
Index: wxSpamOptions.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSpamOptions.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -2 -r1.5 -r1.6
--- wxSpamOptions.cpp 19 Sep 2003 13:31:21 -0000 1.5
+++ wxSpamOptions.cpp 26 Sep 2003 09:33:44 -0000 1.6
@@ -169,4 +169,17 @@
+class SpamOptionWhiteList : public SpamOption
+{
+public:
+ virtual bool DefaultValue() const { return false; }
+ virtual const char *Token() const
+ { return SPAM_TEST_WHITE_LIST; }
+ virtual const char *ProfileHackName() const
+ { return "SpameWhiteList"; }
+ virtual const char *Title() const
+ { return gettext_noop("No match in &whitelist"); }
+};
+
+
#ifdef USE_RBL
@@ -240,4 +253,7 @@
SpamOption *PickMime() { return &m_checkMime; }
+ SpamOptionWhiteList m_whitelist;
+ SpamOption *PickWhiteList() { return &m_whitelist; }
+
#ifdef USE_RBL
SpamOptionRbl m_checkRBL;
@@ -282,4 +298,5 @@
&SpamOptionManagerBody::PickHtml,
&SpamOptionManagerBody::PickMime,
+ &SpamOptionManagerBody::PickWhiteList,
#ifdef USE_RBL
&SpamOptionManagerBody::PickRBL,
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
