See ChangeLog

Monotone-Parent: 8d42e44b72c2c9e6431e77f6b5c590736449f7d7
Monotone-Revision: bafccbe12139895411068d388269aca400af46ec

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-04-01T13:49:24
Monotone-Branch: ca.inverse.sogo

UI/MailPartViewers/UIxMailPartViewer.m

@@ -1,14 +1,15 @@
 /*
+  Copyright (C) 2007-2009 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
@@ -105,7 +106,7 @@
 - (NSData *) flatContent
 {
   if (flatContent != nil)
-    return [flatContent isNotNull] ? flatContent : nil;
+    return [flatContent isNotNull] ? (id)flatContent : nil;
   
   flatContent = 
     [[[context mailRenderingContext] flatContentForPartPath:
@@ -284,8 +285,8 @@
   
   s = [partPath componentsJoinedByString:@"-"];
   return ([s length] > 0)
-    ? [@"untitled-" stringByAppendingString:s]
-    : @"untitled";
+    ? (id)[@"untitled-" stringByAppendingString:s]
+    : (id)@"untitled";
 }
 
 - (NSFormatter *) sizeFormatter