fix Return-receipt
authorPaul Mangan <paul@claws-mail.org>
Sat, 16 Mar 2002 08:35:53 +0000 (08:35 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sat, 16 Mar 2002 08:35:53 +0000 (08:35 +0000)
AUTHORS
ChangeLog.claws
configure.in
src/messageview.c

diff --git a/AUTHORS b/AUTHORS
index e556a80..4e4e768 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
index fce0c39..3f3ea9d 100644 (file)
@@ -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
index 43cf6c6..6a2f374 100644 (file)
@@ -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
index df664c0..1dcbcbf 100644 (file)
@@ -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);