From 43a51d3b448c53fbb87f1e4d71d831a53bb6b51b Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 1 Mar 2010 17:56:33 +0000
Subject: [PATCH] Monotone-Parent: d349f8009a1f0dc73dad705111ba662894fe6f97
 Monotone-Revision: 708b215bd02d30547b93140994babe45b2472573

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-03-01T17:56:33
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                           |  4 ++--
 SoObjects/SOGo/SOGoDomainDefaults.h |  2 ++
 SoObjects/SOGo/SOGoDomainDefaults.m | 11 +++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e70ce5532..8a3bb8392 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2010-03-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
-	* SoObjects/SOGo/SOGoDomainDefaults.m (-imapAclStyle): removed
-	obsolete method.
+	* SoObjects/SOGo/SOGoDomainDefaults.m (-imapFolderSeparator): new
+	method.
 
 2010-02-23  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.h b/SoObjects/SOGo/SOGoDomainDefaults.h
index 55b946dda..6677e887c 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.h
+++ b/SoObjects/SOGo/SOGoDomainDefaults.h
@@ -39,6 +39,8 @@
 
 - (NSString *) mailDomain;
 - (NSString *) imapServer;
+- (NSString *) imapAclStyle;
+- (NSString *) imapFolderSeparator;
 - (BOOL) imapAclConformsToIMAPExt;
 - (BOOL) forceIMAPLoginWithEmail;
 - (BOOL) forwardEnabled;
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.m b/SoObjects/SOGo/SOGoDomainDefaults.m
index b05b4000e..7878dcc20 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.m
+++ b/SoObjects/SOGo/SOGoDomainDefaults.m
@@ -107,6 +107,17 @@
   return [self stringForKey: @"SOGoIMAPServer"];
 }
 
+#warning should be removed when we make use of imap namespace
+- (NSString *) imapAclStyle
+{
+  return [self stringForKey: @"SOGoIMAPAclStyle"];
+}
+
+- (NSString *) imapFolderSeparator
+{
+  return [self stringForKey: @"NGImap4ConnectionStringSeparator"];
+}
+
 #warning this should be determined from the capabilities
 /* http://www.tools.ietf.org/wg/imapext/draft-ietf-imapext-acl/ */
 - (BOOL) imapAclConformsToIMAPExt