diff options
author | Eduardo Chappa <chappa@washington.edu> | 2018-02-24 16:53:39 -0700 |
---|---|---|
committer | Eduardo Chappa <chappa@washington.edu> | 2018-02-24 16:53:39 -0700 |
commit | eefc696ec87ae287803aa68032649e5a7a9b89d0 (patch) | |
tree | 1a0be044bb1a4d542cf3c722e8b6131a92915621 /pith/mimedesc.c | |
parent | a6441d6f5b283ba98ba2524a64cf5704cd47cb0b (diff) | |
parent | 4675349e255a189126ab4922c7b95f761e673c64 (diff) | |
download | alpine-eefc696ec87ae287803aa68032649e5a7a9b89d0.tar.xz |
Merge branch 'ical'
Diffstat (limited to 'pith/mimedesc.c')
-rw-r--r-- | pith/mimedesc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pith/mimedesc.c b/pith/mimedesc.c index ab47770d..6d5999c4 100644 --- a/pith/mimedesc.c +++ b/pith/mimedesc.c @@ -252,7 +252,8 @@ describe_mime(struct mail_bodystruct *body, char *prefix, int num, * be expensive to test... */ if((body->type == TYPETEXT && !named) - || MIME_VCARD(body->type,body->subtype)){ + || MIME_VCARD(body->type,body->subtype) + || MIME_VCALENDAR(body->type, body->subtype)){ a->test_deferred = 1; a->can_display = MCD_INTERNAL; } @@ -264,7 +265,8 @@ describe_mime(struct mail_bodystruct *body, char *prefix, int num, /* * Deferred means we can display it */ - a->shown = ((a->can_display & MCD_INTERNAL) + a->shown = MIME_VCALENDAR(body->type, body->subtype) + || ((a->can_display & MCD_INTERNAL) && !MIME_VCARD(body->type,body->subtype) && (!named || multalt || (body->type == TYPETEXT && num == 1 |