fix Return-receipt

diff --git a/AUTHORS b/AUTHORS
index e556a800c54b4b77b3aa5240938425a64b996193..4e4e768f803168389470795b70e081bf8a8feade 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -134,3 +134,4 @@ contributors (beside the above; based on Changelog)
        Ville Skyttä
        Colin Leroy
        Wilbert Berendsen
+       Bob Woodside

diff --git a/ChangeLog.claws b/ChangeLog.claws
index fce0c395209cd4a0eb55ecc991e33ac58a3cf351..3f3ea9d9bc4a86bdaa5184c3b77fc1f85b4f79a1 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-03-16 [paul]      0.7.4claws14
+
+       * src/messageview.c
+               fix Return-receipt. Patch submitted by Bob
+               Woodside <rwoodside1@comcast.net>
+
 2002-03-16 [paul]      0.7.4claws13
 
        * src/compose.c

diff --git a/configure.in b/configure.in
index 43cf6c6a30ed8aed0508cf8648efbd0d3d48ca7b..6a2f3741a9ebd62988589f853dda4a419a5f8ba9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws13
+EXTRA_VERSION=claws14
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/messageview.c b/src/messageview.c
index df664c0ab03bd072830f58f1f17cba912439b715..1dcbcbf2d0da986f28b21d1e786e6c7fc9591160 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -400,7 +400,8 @@ void messageview_show(MessageView *messageview, MsgInfo *msginfo,
        if (prefs_common.return_receipt
            && (tmpmsginfo->dispositionnotificationto
                || tmpmsginfo->returnreceiptto)
-           && (MSG_IS_RETRCPT_PENDING(msginfo->flags))) {
+           && (MSG_IS_UNREAD(tmpmsginfo->flags))
+           && (MSG_IS_RETRCPT_PENDING(tmpmsginfo->flags))) {
                gint ok;
                
                if (alertpanel(_("Return Receipt"), _("Send return receipt ?"),
@@ -409,7 +410,7 @@ void messageview_show(MessageView *messageview, MsgInfo *msginfo,
                        if (ok < 0)
                                alertpanel_error(_("Error occurred while sending notification."));
                }
-               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_RETRCPT_PENDING);      
+               MSG_UNSET_PERM_FLAGS(tmpmsginfo->flags, MSG_RETRCPT_PENDING);   
        }
 
        headerview_show(messageview->headerview, tmpmsginfo);