Update of /cvsroot/mahogany/M/src/mail
In directory sc8-pr-cvs1:/tmp/cvs-serv17079/src/mail

Modified Files:
        MailFolderCC.cpp 
Log Message:
Hiding sender/subject, version II

Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.680
retrieving revision 1.681
diff -b -u -2 -r1.680 -r1.681
--- MailFolderCC.cpp    7 Oct 2003 12:42:00 -0000       1.680
+++ MailFolderCC.cpp    9 Oct 2003 11:00:03 -0000       1.681
@@ -672,21 +672,17 @@
          MGuiLocker locker;
 
-         String from = entry.GetFrom();
-         String subject = entry.GetSubject();
+         // construct the label
+         String label;
+         label << m_msgProgress << _T('\n');
          
-         if( FilterNewMailContext::IsInStack() )
+         // Don't show subject/sender if the mail is going to be filtered.
+         // There may be heaps of spam and whatever garbage. It's
+         // unnecessary anyway, because headers are downloaded faster
+         // than user can see them.
+         if( !FilterNewMailContext::IsInStack() )
          {
-            RefCounter<FilterRule> filter(FilterNewMailContext::GetFilter());
-            if( filter->ContainsSpamTest() )
-            {
-               subject = from = _("(hidden in spam filter)");
-            }
+            label << _T('\n') << _("From: ") << entry.GetFrom() << _T('\n')
+               << _("Subject: ") << entry.GetSubject();
          }
-
-         // construct the label
-         String label;
-         label << m_msgProgress << '\n'
-               << _("From: ") << from << '\n'
-               << _("Subject: ") << subject;
 
          if ( !m_progdlg->Update(m_nRetrieved, label) )



-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to