Update of /cvsroot/mahogany/M/src/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15690/src/modules
Modified Files:
Filters.cpp
Log Message:
restored showing full email in filtering progress dialog (but not in th
statusbar)
Index: Filters.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Filters.cpp,v
retrieving revision 1.199
retrieving revision 1.200
diff -b -u -2 -r1.199 -r1.200
--- Filters.cpp 30 Jun 2005 14:20:25 -0000 1.199
+++ Filters.cpp 1 Jul 2005 17:48:36 -0000 1.200
@@ -468,5 +468,5 @@
void CreateProgressDialog();
bool GetMessage();
- void GetSenderSubject(String& from, String& subject);
+ void GetSenderSubject(String& from, String& subject, bool full);
bool TreatAsJunk();
String CreditsCommon();
@@ -2886,5 +2886,5 @@
}
-void FilterRuleApply::GetSenderSubject(String& from, String& subject)
+void FilterRuleApply::GetSenderSubject(String& from, String& subject, bool
full)
{
subject = MailFolder::DecodeHeader(m_parent->m_MailMessage->Subject());
@@ -2894,4 +2894,10 @@
if ( addr )
{
+ if ( full )
+ {
+ from = addr->GetAddress();
+ }
+ else // short form
+ {
// show just the personal name if any, otherwise show the address
from = addr->GetName();
@@ -2899,4 +2905,5 @@
from << _T('<') << addr->GetEMail() << _T('>');
}
+ }
else // no valid sender address
{
@@ -2944,5 +2951,5 @@
String from;
String subject;
- GetSenderSubject(from, subject);
+ GetSenderSubject(from, subject, true /* full */);
textPD << _T('\n') << _("From: ") << from
@@ -2962,5 +2969,5 @@
String from;
String subject;
- GetSenderSubject(from, subject);
+ GetSenderSubject(from, subject, false /* short */);
textLog << _T(" (");
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
