From: Paul Mangan <paul@claws-mail.org>
Date: Sat, 16 Mar 2002 08:35:53 +0000 (+0000)
Subject: fix Return-receipt
X-Git-Tag: rel_0_7_5~127
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=2c41d9838260950ea15e7ce208ab4671e1fb60a0

fix Return-receipt
---

diff --git a/AUTHORS b/AUTHORS
index e556a800c..4e4e768f8 100644
--- 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 fce0c3952..3f3ea9d9b 100644
--- 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 43cf6c6a3..6a2f3741a 100644
--- 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 df664c0ab..1dcbcbf2d 100644
--- 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);