Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7889/src/gui
Modified Files:
wxComposeView.cpp wxFolderView.cpp wxOptionsDlg.cpp
Log Message:
removed deprecated address-parsing functions from Message and replaced them
with Address class methods
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.406
retrieving revision 1.407
diff -b -u -2 -r1.406 -r1.407
--- wxComposeView.cpp 16 Apr 2006 19:46:26 -0000 1.406
+++ wxComposeView.cpp 23 Jun 2006 23:27:30 -0000 1.407
@@ -143,5 +143,4 @@
extern const MOption MP_USE_SENDMAIL;
extern const MOption MP_VCARD;
-extern const MOption MP_WHITE_LIST;
#ifdef OS_UNIX
@@ -2639,5 +2638,5 @@
for ( size_t n = 0; n < count; n++ )
{
- if ( Message::CompareAddresses(m_rcptExtra[n]->GetValue(), addr) )
+ if ( Address::Compare(m_rcptExtra[n]->GetValue(), addr) )
{
// ok, we already have this address - is it of the same type?
Index: wxFolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderView.cpp,v
retrieving revision 1.677
retrieving revision 1.678
diff -b -u -2 -r1.677 -r1.678
--- wxFolderView.cpp 17 Apr 2006 15:35:25 -0000 1.677
+++ wxFolderView.cpp 23 Jun 2006 23:27:30 -0000 1.678
@@ -83,4 +83,5 @@
#include "UIdArray.h"
#include "MSearch.h"
+#include "Address.h"
#include "MFStatus.h"
@@ -3036,8 +3037,20 @@
if ( GetSettings().senderOnlyNames )
{
- String name = Message::GetNameFromAddress(text);
- if ( !name.empty() )
+ String names;
+
+ AddressList_obj addrList(text);
+ for ( Address *addr = addrList->GetFirst();
+ addr;
+ addr = addrList->GetNext(addr) )
+ {
+ if ( !names.empty() )
+ names += ", ";
+
+ names += addr->GetName();
+ }
+
+ if ( !names.empty() )
{
- text = name;
+ text = names;
}
//else: leave address without names as is
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.428
retrieving revision 1.429
diff -b -u -2 -r1.428 -r1.429
--- wxOptionsDlg.cpp 8 Apr 2006 19:06:14 -0000 1.428
+++ wxOptionsDlg.cpp 23 Jun 2006 23:27:30 -0000 1.429
@@ -485,4 +485,5 @@
ConfigField_AutoCollectOutgoing,
ConfigField_AutoCollectNameless,
+ ConfigField_WhiteListHelp,
ConfigField_WhiteList,
#ifdef USE_BBDB
@@ -1659,5 +1660,9 @@
{ gettext_noop("Collect addresses in &outgoing mail"), Field_Bool,
ConfigField_AutoCollect},
{ gettext_noop("Ignore addresses without &names"), Field_Bool,
ConfigField_AutoCollect},
- { gettext_noop("&Whitelist"), Field_Text | Field_AppWide,
-1 },
+
+ { gettext_noop("\nWhite list is the list of addresses which always pass "
+ "through the built-in spam filter."),
+ Field_Message, -1 },
+ { gettext_noop("Addresses in &white list"), Field_List, -1 },
#ifdef USE_BBDB
{ gettext_noop("The following settings configure the support of the Big
Brother\n"
@@ -2173,4 +2178,5 @@
CONFIG_ENTRY(MP_AUTOCOLLECT_OUTGOING),
CONFIG_ENTRY(MP_AUTOCOLLECT_NAMED),
+ CONFIG_NONE(),
CONFIG_ENTRY(MP_WHITE_LIST),
#ifdef USE_BBDB
@@ -4018,17 +4024,25 @@
MH_OPAGE_ADB)
{
- m_lboxData = new LboxData;
- m_lboxData->m_idListbox = ConfigField_OwnAddresses;
- m_lboxData->m_lboxDlgTitle = _("My own addresses");
- m_lboxData->m_lboxDlgPrompt = _("Address");
- m_lboxData->m_lboxDlgPers = _T("LastMyAddress");
-
- LboxData *lboxData2 = new LboxData;
- lboxData2->m_idListbox = ConfigField_MLAddresses;
- lboxData2->m_lboxDlgTitle = _("Mailing list addresses");
- lboxData2->m_lboxDlgPrompt = _("Address");
- lboxData2->m_lboxDlgPers = _T("LastMLAddress");
+ LboxData *lboxDataOwnAddr = new LboxData;
+ lboxDataOwnAddr->m_idListbox = ConfigField_OwnAddresses;
+ lboxDataOwnAddr->m_lboxDlgTitle = _("My own addresses");
+ lboxDataOwnAddr->m_lboxDlgPrompt = _("Address");
+ lboxDataOwnAddr->m_lboxDlgPers = _T("LastMyAddress");
+
+ LboxData *lboxDataMLAddr = new LboxData;
+ lboxDataMLAddr->m_idListbox = ConfigField_MLAddresses;
+ lboxDataMLAddr->m_lboxDlgTitle = _("Mailing list addresses");
+ lboxDataMLAddr->m_lboxDlgPrompt = _("Address");
+ lboxDataMLAddr->m_lboxDlgPers = _T("LastMLAddress");
+ lboxDataMLAddr->m_next = lboxDataOwnAddr;
+
+ LboxData *lboxDataWhiteList = new LboxData;
+ lboxDataWhiteList->m_idListbox = ConfigField_WhiteList;
+ lboxDataWhiteList->m_lboxDlgTitle = _("White-listed addresses");
+ lboxDataWhiteList->m_lboxDlgPrompt = _("Address");
+ lboxDataWhiteList->m_lboxDlgPers = _T("LastWhiteList");
+ lboxDataWhiteList->m_next = lboxDataMLAddr;
- m_lboxData->m_next = lboxData2;
+ m_lboxData = lboxDataWhiteList;
}
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
