Monotone-Parent: a93dd2767c4f017932c6339f82394fd558ef304f

Monotone-Revision: 7e63e5fdd760a91e91ec6f1759064a5e5c2f267f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-10-23T15:35:20
Monotone-Branch: ca.inverse.sogo

UI/MailerUI/UIxMailListView.m

@@ -274,11 +274,11 @@
   parts = [[message objectForKey: @"body"] objectForKey: @"parts"];
   if ([parts count] > 1)
     {
-      dispositions
-	= [[parts objectsForKey: @"disposition"] objectEnumerator];
+      dispositions = [[parts objectsForKey: @"disposition"
+			     notFoundMarker: nil] objectEnumerator];
       while (!hasAttachment
 	     && (currentDisp = [dispositions nextObject]))
-	  hasAttachment = ([[currentDisp objectForKey: @"type"] length]);
+	hasAttachment = ([[currentDisp objectForKey: @"type"] length]);
     }
 
   return hasAttachment;

UI/MailerUI/UIxMailMainFrame.m

@@ -69,12 +69,14 @@
 }
 
 /* accessors */
+
+#warning this method is a duplication of SOGoMailAccounts:toManyRelationShipKeys
 - (NSString *) mailAccounts
 {
   NSArray *accounts, *accountNames;
 
   accounts = [[context activeUser] mailAccounts];
-  accountNames = [accounts objectsForKey: @"name"];
+  accountNames = [accounts objectsForKey: @"name" notFoundMarker: nil];
 
   return [accountNames jsonRepresentation];
 }
@@ -183,7 +185,8 @@
   
   // We use the first mail account
   accounts = [[context activeUser] mailAccounts];
-  firstAccount = [[accounts objectsForKey: @"name"] objectAtIndex: 0];
+  firstAccount = [[accounts objectsForKey: @"name" notFoundMarker: nil]
+		   objectAtIndex: 0];
   request = [context request];
   
   if ((folderId = [request formValueForKey: @"folder"]) &&