sync with sylpheed 0.7.1cvs1

diff --git a/ChangeLog b/ChangeLog
index 049b309e79e972fcffbdaf6f34c1df049c4334bc..21347b2227d904bc01188a046b03818ab3403512 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
 2002-02-11
 
        * version 0.7.1

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2614471b0fdd36bf4d63fccf99c603fe6347ba32..c3996ce1a9d35fc26a1dea7f3a86c70dde03c6f2 100644 (file)
--- 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
 2002-02-12 [melvin]    0.7.0claws64
 
        * src/prefs_actions.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 788e754d30f6a0e361299d8683f3a8a5b8308c99..031b059a39509489485b534de1d5d4eaabbbe296 100644 (file)
--- 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
 2002-02-11
 
        * version 0.7.1

diff --git a/configure.in b/configure.in
index 2228177d22f4e96b3f89f2a597bbd1af7c082353..1858f34cedb714b651df099a659b95e15aa27466 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/procmsg.c b/src/procmsg.c
index 9942c36cf46b6c4cbd51672e9d412719ccacf7ee..b1ceec61f5cfb6cc2f0db2e55494ec3a5847ad6a 100644 (file)
--- 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);
 
 
        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);
 
        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);
        if ((fp = fopen(file, "r")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                g_free(file);