From: Pierre Habouzit Date: Wed, 8 Nov 2006 21:31:22 +0000 (+0100) Subject: wibble X-Git-Url: http://git.madism.org/?a=commitdiff_plain;h=b98a7ae42f4b22221cf6ba32bf6f29431a07b604;p=apps%2Fmadmutt.git wibble Signed-off-by: Pierre Habouzit --- diff --git a/commands.c b/commands.c index 34de35e..aca2845 100644 --- a/commands.c +++ b/commands.c @@ -891,14 +891,14 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp) b->force_charset |= charset_changed ? 1 : 0; - if (!is_multipart (b) && b->parts) + if (!is_multipart(b) && b->parts) mutt_free_body (&b->parts); if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) { b->hdr->content = NULL; header_delete(&b->hdr); } - if (fp && (is_multipart (b) || mutt_is_message_type (b->type, b->subtype))) + if (fp && (is_multipart(b) || mutt_is_message_type(b->type, b->subtype))) mutt_parse_part (fp, b); if (h) { diff --git a/lib-mime/mime.h b/lib-mime/mime.h index 30e5453..4e678e4 100644 --- a/lib-mime/mime.h +++ b/lib-mime/mime.h @@ -45,8 +45,9 @@ extern const char *BodyEncodings[]; #define is_multipart(x) \ ((x)->type == TYPEMULTIPART \ || ((x)->type == TYPEMESSAGE && \ - (!mime_which_token((x)->subtype, -1) == MIME_RFC822) \ - || !mime_which_token((x)->subtype, -1) == MIME_NEWS)) + ((!mime_which_token((x)->subtype, -1) == MIME_RFC822) \ + || !mime_which_token((x)->subtype, -1) == MIME_NEWS))) + #define TYPE(X) ((X->type == TYPEOTHER) && (X->xtype != NULL) ? X->xtype : BodyTypes[(X->type)]) #define ENCODING(X) BodyEncodings[(X)]