wibble

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/commands.c b/commands.c
index 34de35e..aca2845 100644 (file)
--- 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;
 
 
   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);
   }
 
     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) {
     mutt_parse_part (fp, b);
 
   if (h) {

diff --git a/lib-mime/mime.h b/lib-mime/mime.h
index 30e5453..4e678e4 100644 (file)
--- 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 && \
 #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)]
 
 #define TYPE(X) ((X->type == TYPEOTHER) && (X->xtype != NULL) ? X->xtype : BodyTypes[(X->type)])
 #define ENCODING(X) BodyEncodings[(X)]