From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Wed, 27 Oct 2004 20:25:13 +0000 (+0000)
Subject: fixed IMAP4 separator
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c84352834f7959379aab3f0748a3b6d4708b4f6b;p=scalable-opengroupware.org

fixed IMAP4 separator


git-svn-id: http://svn.opengroupware.org/SOGo/trunk@436 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog
index 36fb78e8..2373a95d 100644
--- a/SOGo/SoObjects/Mailer/ChangeLog
+++ b/SOGo/SoObjects/Mailer/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-27  Helge Hess  <helge.hess@opengroupware.org>
 
+	* SOGoMailManager.m: added 'SOGoIMAP4StringSeparator' default to
+	  configure to folder separator. Default is '/' instead of '.'
+	  (v0.9.43)
+
 	* v0.9.42
 
 	* SOGoDraftObject.m: implements some SOGoMailObject methods
diff --git a/SOGo/SoObjects/Mailer/SOGoMailManager.m b/SOGo/SoObjects/Mailer/SOGoMailManager.m
index 49b1c03d..f565be8a 100644
--- a/SOGo/SoObjects/Mailer/SOGoMailManager.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailManager.m
@@ -32,6 +32,7 @@ static BOOL           debugCache = NO;
 static BOOL           debugKeys  = NO;
 static BOOL           poolingOff = NO;
 static NSTimeInterval PoolScanInterval = 5 * 60;
+static NSString       *imap4Separator  = nil;
 
 + (void)initialize {
   NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
@@ -42,7 +43,11 @@ static NSTimeInterval PoolScanInterval = 5 * 60;
 
   if (debugOn)    NSLog(@"Note: SOGoEnableIMAP4Debug is enabled!");
   if (poolingOff) NSLog(@"WARNING: IMAP4 connection pooling is disabled!");
-    
+  
+  imap4Separator = [[ud stringForKey:@"SOGoIMAP4StringSeparator"] copy];
+  if ([imap4Separator length] == 0)
+    imap4Separator = @"/";
+  NSLog(@"Note: using '%@' as the IMAP4 folder separator.");
 }
 
 + (id)defaultMailManager {
@@ -228,7 +233,7 @@ static NSTimeInterval PoolScanInterval = 5 * 60;
 }
 
 - (NSString *)imap4Separator {
-  return @".";
+  return imap4Separator;
 }
 
 - (NSString *)imap4FolderNameForURL:(NSURL *)_url removeFileName:(BOOL)_delfn {
diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version
index 8638a8c5..8513b555 100644
--- a/SOGo/SoObjects/Mailer/Version
+++ b/SOGo/SoObjects/Mailer/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=42
+SUBMINOR_VERSION:=43
 
 # v0.9.51 requires NGMime    v4.3.190
 # v0.9.35 requires SOGoLogic v0.9.24