From 4f4cbcf5fb96f6270fe1818e5ce114c7eed2ba77 Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Tue, 12 Feb 2002 14:10:29 +0000
Subject: [PATCH] sync with sylpheed 0.7.1cvs1

---
 ChangeLog       | 6 ++++++
 ChangeLog.claws | 5 +++++
 ChangeLog.jp    | 6 ++++++
 configure.in    | 2 +-
 src/procmsg.c   | 8 +++++++-
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 049b309e7..21347b222 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-12
+
+	* src/procmsg.c: procmsg_open_message(): modified so that it
+	  returns the stream of decrypted message file if it exists
+	  (this fixes the failure of gpg decryption in messageview.c).
+
 2002-02-11
 
 	* version 0.7.1
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2614471b0..c3996ce1a 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-02-12 [paul]	0.7.0claws65
+
+	* sync with sylpheed 0.7.1cvs1
+		see ChangeLog entry 2002-02-12
+
 2002-02-12 [melvin]	0.7.0claws64
 
 	* src/prefs_actions.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 788e754d3..031b059a3 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,9 @@
+2002-02-12
+
+	* src/procmsg.c: procmsg_open_message(): ¥Ç¥³¡¼¥É¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸
+	  ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ì¤Ð¤½¤Î¥¹¥È¥ê¡¼¥à¤òÊÖ¤¹¤è¤¦¤Ë½¤Àµ
+	  (messageview.c ¤Ç gpg °Å¹æ²ò½ü¤Ë¼ºÇÔ¤¹¤ë¤Î¤ò½¤Àµ)¡£
+
 2002-02-11
 
 	* version 0.7.1
diff --git a/configure.in b/configure.in
index 2228177d2..1858f34ce 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws64
+EXTRA_VERSION=claws65
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/procmsg.c b/src/procmsg.c
index 9942c36cf..b1ceec61f 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -707,9 +707,15 @@ FILE *procmsg_open_message(MsgInfo *msginfo)
 
 	g_return_val_if_fail(msginfo != NULL, NULL);
 
-	file = procmsg_get_message_file(msginfo);
+	file = procmsg_get_message_file_path(msginfo);
 	g_return_val_if_fail(file != NULL, NULL);
 
+	if (!is_file_exist(file)) {
+		g_free(file);
+		file = procmsg_get_message_file(msginfo);
+		g_return_val_if_fail(file != NULL, NULL);
+	}
+
 	if ((fp = fopen(file, "r")) == NULL) {
 		FILE_OP_ERROR(file, "fopen");
 		g_free(file);
-- 
2.25.1