change crypted message tests to reask passphrase if necessary

fixes bug #5

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 21d00faa6fe20a26ef420acac870884e19575b03..bb485f8c2951af98bdfe440c1992038f4bb96339 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 e1746cdb144a14d05c34b466373d40fed4bfc32b..8a32fe96730f3a08b30f9dfc500eb9bc26f50702 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 7dabf8d6f40b6ac20f9ae6fb359cec28ad1e2a48..50278cf37daf7341438f724bc4550bc5acbbb1f5 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) {