Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv4414/src/classes
Modified Files:
MessageView.cpp
Log Message:
show signed messages even if we couldn't check the signature
Index: MessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageView.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -b -u -2 -r1.135 -r1.136
--- MessageView.cpp 3 Oct 2003 22:17:00 -0000 1.135
+++ MessageView.cpp 7 Oct 2003 11:03:36 -0000 1.136
@@ -1932,10 +1932,18 @@
if ( mimepart->GetParam(_T("protocol")) == _T("application/pgp-signature") )
{
+ static const char *sigIgnoredMsg =
+ gettext_noop("\n\nSignature will be ignored");
+
MimePart * const signedPart = mimepart->GetNested();
MimePart * const signaturePart = signedPart->GetNext();
if ( !signedPart || !signaturePart )
{
- wxLogError(_("This message pretends to be signed but "
- "doesn't have the correct MIME structure."));
+ wxLogWarning(String(_("This message pretends to be signed but "
+ "doesn't have the correct MIME structure.")) +
+ _(sigIgnoredMsg));
+
+ // still show the message contents
+ ProcessAllNestedParts(mimepart);
+
return;
}
@@ -1951,7 +1959,10 @@
if ( signaturePart->GetType().GetFull() != _T("APPLICATION/PGP-SIGNATURE") )
{
- wxLogError(_("Signed message signature does not have a "
- "\"application/pgp-signature\" type, "
- "ignoring it."));
+ wxLogWarning(String(_("Signed message signature does not have a "
+ "\"application/pgp-signature\" type.")) +
+ _(sigIgnoredMsg));
+
+ ProcessAllNestedParts(mimepart);
+
return;
}
-------------------------------------------------------
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
