From 4eac9ac1e39bbbc8f96a654513594c1a9141d6bf Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 5 Sep 2008 02:38:51 +0000 Subject: [PATCH] Monotone-Parent: 6ea404f36c9613aee16746663a599b51a421006c Monotone-Revision: 721baf81426a46990c5c456d170347f03f502d1f Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-09-05T02:38:51 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ UI/MailPartViewers/UIxMailPartAlternativeViewer.m | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index aa67efedd..2c3b81d5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-09-04 Wolfgang Sourdeau + * UI/MailPartViewers/UIxMailPartAlternativeViewer.m + ([UIxMailPartAlternativeViewer -selectPartIndexFromTypes:]): give + precedence on multipart/related parts. + * UI/MailPartViewers/UIxMailRenderingContext.m ([UIxMailRenderingContext -viewerForBodyInfo:_info]): add the mixed viewer as the viewer for "multipart/digest" content. diff --git a/UI/MailPartViewers/UIxMailPartAlternativeViewer.m b/UI/MailPartViewers/UIxMailPartAlternativeViewer.m index 72ed9b3a0..cf66d6ee9 100644 --- a/UI/MailPartViewers/UIxMailPartAlternativeViewer.m +++ b/UI/MailPartViewers/UIxMailPartAlternativeViewer.m @@ -92,6 +92,8 @@ if ((count = [_types count]) == 0) return NSNotFound; + if ((i = [_types indexOfObject:@"multipart/related"]) != NSNotFound) + return i; if ((i = [_types indexOfObject:@"text/calendar"]) != NSNotFound) return i; if ((i = [_types indexOfObject:@"text/html"]) != NSNotFound)