diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-11-10 06:00:54 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-11-10 06:00:54 +0800 |
| commit | 7d2baffd501420a0414f686ef0a35d0e71174661 (patch) | |
| tree | 81d7ac71789a8d51522ca0bb429d78452a893197 /camel/camel-smime-utils.c | |
| parent | 7f1c4d58ea508131328d7646250688460c1acffa (diff) | |
| download | gsoc2013-evolution-7d2baffd501420a0414f686ef0a35d0e71174661.tar gsoc2013-evolution-7d2baffd501420a0414f686ef0a35d0e71174661.tar.gz gsoc2013-evolution-7d2baffd501420a0414f686ef0a35d0e71174661.tar.bz2 gsoc2013-evolution-7d2baffd501420a0414f686ef0a35d0e71174661.tar.lz gsoc2013-evolution-7d2baffd501420a0414f686ef0a35d0e71174661.tar.xz gsoc2013-evolution-7d2baffd501420a0414f686ef0a35d0e71174661.tar.zst gsoc2013-evolution-7d2baffd501420a0414f686ef0a35d0e71174661.zip | |
If any of the pipe()'s fail, clean up any pipes that may have succeeded.
2001-11-08 Jeffrey Stedfast <fejj@ximian.com>
* camel-pgp-context.c (crypto_exec_with_passwd): If any of the
pipe()'s fail, clean up any pipes that may have succeeded. Also
close the password fds.
svn path=/trunk/; revision=14649
Diffstat (limited to 'camel/camel-smime-utils.c')
| -rw-r--r-- | camel/camel-smime-utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/camel/camel-smime-utils.c b/camel/camel-smime-utils.c index 2a5a8d723f..188ed8a17f 100644 --- a/camel/camel-smime-utils.c +++ b/camel/camel-smime-utils.c @@ -99,21 +99,21 @@ camel_smime_is_smime_v3_encrypted (CamelMimePart *mime_part) return TRUE; } - if (header_content_type_is (type, "application", "octent-stream")) { + if (header_content_type_is (type, "application", "octet-stream")) { /* check to see if we have a paremeter called "smime-type" */ param = header_content_type_param (type, "smime-type"); if (param) return TRUE; /* check to see if there is a name param and if it has a smime extension */ - param = header_content_type_param (type, "smime-type"); + param = header_content_type_param (type, "name"); if (param && *param && strlen (param) > 4) { for (i = 0; types[i]; i++) if (!g_strcasecmp (param + strlen (param)-4, types[i])) return TRUE; } - /* check to see if there is a name param and if it has a smime extension */ + /* check to see if there is a filename param and if it has a smime extension */ filename = camel_mime_part_get_filename (mime_part); if (filename && *filename && strlen (filename) > 4) { for (i = 0; types[i]; i++) |