Monotone-Parent: c85488a496026efc268c07b0e8c84d1c1d1983d7

Monotone-Revision: 42e55c8292b29dad1cd5260453c22ca05fb07f6e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-19T16:25:55
Monotone-Branch: ca.inverse.sogo

SoObjects/Mailer/SOGoMailAccount.m

@@ -197,13 +197,26 @@ static NSString *sieveScriptName = @"sogo";
   return imapAclStyle;
 }
 
+/* see http://tools.ietf.org/id/draft-ietf-imapext-acl */
 - (BOOL) imapAclConformsToIMAPExt
 {
-  SOGoDomainDefaults *dd;
+  NGImap4Client *imapClient;
+  NSArray *capability;
+  int count, max;
+  BOOL conforms;
 
-  dd = [[context activeUser] domainDefaults];
+  conforms = NO;
 
-  return [dd imapAclConformsToIMAPExt];
+  imapClient = [[self imap4Connection] client];
+  capability = [[imapClient capability] objectForKey: @"capability"];
+  max = [capability count];
+  for (count = 0; !conforms && count < max; count++)
+    {
+      if ([[capability objectAtIndex: count] hasPrefix: @"acl2"])
+	conforms = YES;
+    }
+
+  return conforms;
 }
 
 - (BOOL) supportsQuotas