From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Wed, 26 Sep 2001 18:05:09 +0000 (+0000)
Subject: reintroduce return-receipt-request things lost because procheader_parse() seems to... 
X-Git-Tag: Release_0_6_4claws12~102
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f4918f4b6d19df9a03627d4046bd196d28fb9e15

reintroduce return-receipt-request things lost because procheader_parse() seems to have been changed (???)
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index cdade83b0..ae8941985 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2001-09-26 [alfons]	0.6.2claws8
+
+	* src/messageview.c
+		introduce return receipt request notification again,
+		which was lost because of other semantics in 
+		procheader_parse() (???)
+
 2001-09-26 [christoph]	0.6.2claws7
 
 	* src/compose.c
diff --git a/configure.in b/configure.in
index 79f4f79e4..7f8af1eda 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws7
+EXTRA_VERSION=claws8
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
diff --git a/src/messageview.c b/src/messageview.c
index 7334062ba..64926e4bd 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -405,12 +405,17 @@ void messageview_show(MessageView *messageview, MsgInfo *msginfo)
 	file = procmsg_get_message_file_path(msginfo);
 	g_return_if_fail(file != NULL);
 
+	/* FIXME - doesn't tmpmsginfo->flags have the value
+	 * of msginfo->flags after procheader_parse()???
+	 * in any case, checking tmpmsginfo->flags for MSG_UNREAD
+	 * fixes the return-receipt-request bug */
+
 	tmpmsginfo = procheader_parse(file, msginfo->flags, TRUE);
 
 	if (prefs_common.return_receipt
 	    && (tmpmsginfo->dispositionnotificationto
 		|| tmpmsginfo->returnreceiptto)
-	    && (MSG_IS_UNREAD(msginfo->flags))) {
+	    && (MSG_IS_UNREAD(tmpmsginfo->flags))) {
 		gint ok;
 		
 		if (alertpanel(_("Return Receipt"), _("Send return receipt ?"),