From 5de096bc9fcdbb86b6f760a90faa5d27d3f4f929 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 1 Mar 2010 16:43:45 +0000
Subject: [PATCH] Monotone-Parent: 21ee7a1f6257a0c47b6bce99b088614daf239ad3
 Monotone-Revision: d349f8009a1f0dc73dad705111ba662894fe6f97

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-03-01T16:43:45
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                           | 5 +++++
 SoObjects/SOGo/SOGoDomainDefaults.h | 1 -
 SoObjects/SOGo/SOGoDomainDefaults.m | 6 ------
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb3603edd..e70ce5532 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoDomainDefaults.m (-imapAclStyle): removed
+	obsolete method.
+
 2010-02-23  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Added a patch from Adam Yearout <ayearout@royal.wednet.edu>
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.h b/SoObjects/SOGo/SOGoDomainDefaults.h
index 4a304098c..55b946dda 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.h
+++ b/SoObjects/SOGo/SOGoDomainDefaults.h
@@ -39,7 +39,6 @@
 
 - (NSString *) mailDomain;
 - (NSString *) imapServer;
-- (NSString *) imapAclStyle;
 - (BOOL) imapAclConformsToIMAPExt;
 - (BOOL) forceIMAPLoginWithEmail;
 - (BOOL) forwardEnabled;
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.m b/SoObjects/SOGo/SOGoDomainDefaults.m
index 30eea0b1f..b05b4000e 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.m
+++ b/SoObjects/SOGo/SOGoDomainDefaults.m
@@ -107,12 +107,6 @@
   return [self stringForKey: @"SOGoIMAPServer"];
 }
 
-#warning should be removed when we make use of imap namespace
-- (NSString *) imapAclStyle
-{
-  return [self stringForKey: @"SOGoIMAPAclStyle"];
-}
-
 #warning this should be determined from the capabilities
 /* http://www.tools.ietf.org/wg/imapext/draft-ietf-imapext-acl/ */
 - (BOOL) imapAclConformsToIMAPExt