change crypted message tests to reask passphrase if necessary

fixes bug #5

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 21d00fa..bb485f8 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2003-01-16 [colin]     0.8.8claws107
+
+       * src/procmsg.c
+               Changed encryption test to re-ask passphrase
+               if an encrypted message hasn't been decrypted
+               Fixes bug #5
+
 2003-01-16 [christoph] 0.8.8claws106
 
        * src/prefs_gtk.c

diff --git a/configure.ac b/configure.ac
index e1746cd..8a32fe9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws106
+EXTRA_VERSION=claws107
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/procmsg.c b/src/procmsg.c
index 7dabf8d..50278cf 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -810,8 +810,7 @@ FILE *procmsg_open_message_decrypted(MsgInfo *msginfo, MimeInfo **mimeinfo)
        }
 
        if (MSG_IS_ENCRYPTED(msginfo->flags) &&
-           !msginfo->plaintext_file &&
-           !msginfo->decryption_failed) {
+           (!msginfo->plaintext_file || msginfo->decryption_failed)) {
                rfc2015_decrypt_message(msginfo, mimeinfo_, fp);
                if (msginfo->plaintext_file &&
                    !msginfo->decryption_failed) {