From be3b539741a3293ea5369c6817b2fbad28628c51 Mon Sep 17 00:00:00 2001 From: Thomas Roessler Date: Tue, 2 Feb 1999 15:47:44 +0000 Subject: Merging the external character set patch into unstable. Additionally, this change introduces a M_CHARCONV state flag which gives us some more control about when character set conversions are actually done. Current versions of mutt would happily apply character set conversions when, e.g., saving a text/plain attachment to a file. (We had at least one corrupt russing translation file due to this mis-feature.) Additionally, we clean up some of the character set related code in handler.c. Most of that is now done by the decoder functions in charset.c. --- pgp.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'pgp.c') diff --git a/pgp.c b/pgp.c index 375cb6a2..18269ad9 100644 --- a/pgp.c +++ b/pgp.c @@ -1,6 +1,6 @@ /* * Copyright (C) 1996,1997 Michael R. Elkins - * Copyright (c) 1998 Thomas Roessler + * Copyright (c) 1998,1999 Thomas Roessler * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -479,35 +479,35 @@ void pgp_application_pgp_handler (BODY *m, STATE *s) } -int mutt_is_multipart_signed(BODY *b) +int mutt_is_multipart_signed (BODY *b) { char *p; - if(!b || b->type != TYPEMULTIPART || - !b->subtype || mutt_strcasecmp(b->subtype, "signed") || - !(p = mutt_get_parameter("protocol", b->parameter)) || - (mutt_strcasecmp(p, "application/pgp-signature") - && mutt_strcasecmp(p, "multipart/mixed"))) + if (!b || b->type != TYPEMULTIPART || + !b->subtype || mutt_strcasecmp (b->subtype, "signed") || + !(p = mutt_get_parameter ("protocol", b->parameter)) || + (mutt_strcasecmp (p, "application/pgp-signature") + && mutt_strcasecmp (p, "multipart/mixed"))) return 0; return PGPSIGN; } -int mutt_is_multipart_encrypted(BODY *b) +int mutt_is_multipart_encrypted (BODY *b) { char *p; - if(!b || b->type != TYPEMULTIPART || - !b->subtype || mutt_strcasecmp(b->subtype, "encrypted") || - !(p = mutt_get_parameter("protocol", b->parameter)) || - mutt_strcasecmp(p, "application/pgp-encrypted")) + if (!b || b->type != TYPEMULTIPART || + !b->subtype || mutt_strcasecmp (b->subtype, "encrypted") || + !(p = mutt_get_parameter ("protocol", b->parameter)) || + mutt_strcasecmp (p, "application/pgp-encrypted")) return 0; return PGPENCRYPT; } -int mutt_is_application_pgp(BODY *m) +int mutt_is_application_pgp (BODY *m) { int t = 0; char *p; -- cgit v1.2.3