From 56f73e2b176d419949fd41fab87c7cbc81ec675d Mon Sep 17 00:00:00 2001
From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Sun, 27 Jul 2003 11:48:03 +0000
Subject: [PATCH] * src/procmsg.c 	add missing header members to MsgInfo;
 fixes the problem of 	not displaying X-Faces, as noticed by Ricardo Mones

---
 ChangeLog.claws |  6 ++++++
 configure.ac    |  2 +-
 src/procmsg.c   | 24 ++++++++++++++----------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 343843cc4..2b704f9a6 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2003-07-27 [alfons]	0.9.3claws58
+
+	* src/procmsg.c
+		add missing header members to MsgInfo; fixes the problem of 
+		not displaying X-Faces, as noticed by Ricardo Mones
+
 2003-07-26 [christoph]	0.9.3claws57
 
 	* sync with 0.9.3cvs18
diff --git a/configure.ac b/configure.ac
index afbe5d83a..208a4291a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=57
+EXTRA_VERSION=58
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/procmsg.c b/src/procmsg.c
index 96ae8728a..201bbe590 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -874,21 +874,11 @@ MsgInfo *procmsg_msginfo_copy(MsgInfo *msginfo)
 
 MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
 {
-#if 0
 	MsgInfo *full_msginfo;
 	gchar *file;
-#endif
 
 	if (msginfo == NULL) return NULL;
 
-	/* 
-	 * In Claws we simply return a new reference to the same msginfo.
-	 * otherwise the new msginfo has wrong flags and causes incorrect
-	 * msgcounts... TODO: fill in data from full_msginfo into msginfo,
-	 * we can then keep the new data in the cache
-         */
-	return procmsg_msginfo_new_ref(msginfo);
-#if 0
 	file = procmsg_get_message_file(msginfo);
 	if (!file) {
 		g_warning("procmsg_msginfo_get_full_info(): can't get message file.\n");
@@ -899,6 +889,20 @@ MsgInfo *procmsg_msginfo_get_full_info(MsgInfo *msginfo)
 	g_free(file);
 	if (!full_msginfo) return NULL;
 
+	/* CLAWS: make sure we add the missing members; see: 
+	 * procheader.c::procheader_get_headernames() */
+	if (!msginfo->xface)
+		msginfo->xface = g_strdup(full_msginfo->xface);
+	if (!msginfo->dispositionnotificationto)
+		msginfo->dispositionnotificationto = 
+			g_strdup(full_msginfo->dispositionnotificationto);
+	if (!msginfo->returnreceiptto)
+		msginfo->returnreceiptto = g_strdup
+			(full_msginfo->returnreceiptto);
+	procmsg_msginfo_free(full_msginfo);
+
+	return procmsg_msginfo_new_ref(msginfo);
+#if 0
 	full_msginfo->msgnum = msginfo->msgnum;
 	full_msginfo->size = msginfo->size;
 	full_msginfo->mtime = msginfo->mtime;
-- 
2.25.1