sync with sylpheed 0.7.1cvs1
authorPaul Mangan <paul@claws-mail.org>
Tue, 12 Feb 2002 14:10:29 +0000 (14:10 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 12 Feb 2002 14:10:29 +0000 (14:10 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/procmsg.c

index 049b309..21347b2 100644 (file)
--- 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
index 2614471..c3996ce 100644 (file)
@@ -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
index 788e754..031b059 100644 (file)
@@ -1,3 +1,9 @@
+2002-02-12
+
+       * src/procmsg.c: procmsg_open_message(): ¥Ç¥³¡¼¥É¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸
+         ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ì¤Ð¤½¤Î¥¹¥È¥ê¡¼¥à¤òÊÖ¤¹¤è¤¦¤Ë½¤Àµ
+         (messageview.c ¤Ç gpg °Å¹æ²ò½ü¤Ë¼ºÇÔ¤¹¤ë¤Î¤ò½¤Àµ)¡£
+
 2002-02-11
 
        * version 0.7.1
index 2228177..1858f34 100644 (file)
@@ -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
index 9942c36..b1ceec6 100644 (file)
@@ -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);