sync with 0.9.3cvs2
authorPaul Mangan <paul@claws-mail.org>
Tue, 8 Jul 2003 06:43:58 +0000 (06:43 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 8 Jul 2003 06:43:58 +0000 (06:43 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/rfc2015.c

index 69ff2dd..8258a64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-08
+
+       * src/rfc2015.c: rfc2015_is_encrypted(): check MimeInfo::mime_type
+         to suppress some warnings.
+
 2003-07-07
 
        * src/compose.c: add 'Content-Disposition: inline' to a text/plain
index 64fc5e7..60cda32 100644 (file)
@@ -1,3 +1,8 @@
+2003-07-08 [paul]      0.9.0claws89
+
+       * sync with 0.9.3cvs2
+               see ChangeLog 2003-07-08
+
 2003-07-08 [match]     0.9.0claws88
 
        * src/ldapctrl.c
index e6ffb45..728a492 100644 (file)
@@ -1,3 +1,8 @@
+2003-07-08
+
+       * src/rfc2015.c: rfc2015_is_encrypted(): ·Ù¹ð¤òÍÞ¤¨¤ë¤¿¤á¤Ë
+         MimeInfo::mime_type ¤ò¥Á¥§¥Ã¥¯¡£
+
 2003-07-07
 
        * src/compose.c: PGP/MIME ½ð̾¤ò»ÈÍѤ¹¤ë¤È¤­¤Ï text/plain ¥Ñ¡¼¥È¤Ë
index 5af5287..e68e08e 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws88
+EXTRA_VERSION=claws89
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 6509f55..5026be4 100644 (file)
@@ -562,7 +562,7 @@ void rfc2015_check_signature (MimeInfo *mimeinfo, FILE *fp)
 
 int rfc2015_is_encrypted (MimeInfo *mimeinfo)
 {
-    if (!mimeinfo)
+    if (!mimeinfo || mimeinfo->mime_type != MIME_MULTIPART)
         return 0;
     if (g_strcasecmp (mimeinfo->content_type, "multipart/encrypted"))
         return 0;