From 75bdb682b92aa2d8ce66666c16609a8581e90143 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 16 Feb 2007 16:54:57 +0000
Subject: [PATCH] Monotone-Parent: 7e21b29e298fa9a1baff1c52d0d806113ce623f4
 Monotone-Revision: b925e538dfea6055e4cd41b6cd352fab2daa7217

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-02-16T16:54:57
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/Mailer/SOGoMailObject.m | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index 10d848cf1..749882e16 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -417,23 +417,13 @@ static BOOL debugSoParts       = NO;
   _type    = [_type    lowercaseString];
   _subtype = [_subtype lowercaseString];
   
-  if ([_type isEqualToString:@"text"]) {
-    if ([_subtype isEqualToString:@"plain"]
-        || [_subtype isEqualToString:@"html"])
-      return YES;
-
-    if ([_subtype isEqualToString:@"calendar"]) /* we also fetch calendars */
-      return YES;
-  }
-
-  if ([_type isEqualToString:@"application"]) {
-    if ([_subtype isEqualToString:@"pgp-signature"])
-      return YES;
-    if ([_subtype hasPrefix:@"x-vnd.kolab."])
-      return YES;
-  }
-  
-  return NO;
+  return (([_type isEqualToString:@"text"]
+           && ([_subtype isEqualToString:@"plain"]
+               || [_subtype isEqualToString:@"html"]
+               || [_subtype isEqualToString:@"calendar"]))
+          || ([_type isEqualToString:@"application"]
+              && ([_subtype isEqualToString:@"pgp-signature"]
+                  || [_subtype hasPrefix:@"x-vnd.kolab."])));
 }
 
 - (void)addRequiredKeysOfStructure:(id)_info path:(NSString *)_p
@@ -825,7 +815,7 @@ static BOOL debugSoParts       = NO;
     In case b) or c) fails, we can't do anything because IMAP4 doesn't tell us
     the ID used in the trash folder.
   */
-  SOGoMailFolder *destFolder;
+  SOGoMailAccounts *destFolder;
   NSEnumerator *folders;
   NSString *currentFolderName, *reason;
   NSException    *error;