From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 22 Jul 2005 12:16:25 +0000 (+0000)
Subject: do not show Drafts folder in shared mailboxes
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05a79cf31a57c2bb34309f93c50e12ff366f3148;p=scalable-opengroupware.org

do not show Drafts folder in shared mailboxes


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

diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog
index c8441cca..9bb16810 100644
--- a/SOGo/SoObjects/Mailer/ChangeLog
+++ b/SOGo/SoObjects/Mailer/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-22  Helge Hess  <helge.hess@opengroupware.org>
 
+	* SOGoSharedMailAccount.m: do not show the drafts folder in share
+	  mailboxes (v0.9.122)
+
 	* SOGoUser+Mail.m: properly set email field of share account identities
 	  (v0.9.121)
 
diff --git a/SOGo/SoObjects/Mailer/SOGoMailAccount.m b/SOGo/SoObjects/Mailer/SOGoMailAccount.m
index 03d8478b..bcb0ea6b 100644
--- a/SOGo/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailAccount.m
@@ -97,7 +97,6 @@ static BOOL     useAltNamespace       = NO;
   NSArray *a, *b;
   
   a = [self additionalRootFolderNames];
-  
   b = [[self imap4Connection] subfoldersForURL:[self imap4URL]];
   return [b count] > 0 ? [b arrayByAddingObjectsFromArray:a] : a;
 }
diff --git a/SOGo/SoObjects/Mailer/SOGoSharedMailAccount.m b/SOGo/SoObjects/Mailer/SOGoSharedMailAccount.m
index 08969d73..27326638 100644
--- a/SOGo/SoObjects/Mailer/SOGoSharedMailAccount.m
+++ b/SOGo/SoObjects/Mailer/SOGoSharedMailAccount.m
@@ -75,6 +75,12 @@ static NSString *otherUsersFolderName = @""; // TODO: add English default
 
 /* listing the available folders */
 
+- (NSArray *)additionalRootFolderNames {
+  /* do not show Drafts folder in shared mailboxes (#1452) */
+  /* Note: this also disables the Sieve folder */
+  return nil;
+}
+
 - (NSArray *)toManyRelationshipKeys {
   NSMutableArray *m;
   NSArray *b;
@@ -86,7 +92,8 @@ static NSString *otherUsersFolderName = @""; // TODO: add English default
   if ((b = [[self imap4Connection] subfoldersForURL:[self imap4URL]]) != nil)
     [m addObjectsFromArray:b];
   
-  [m addObjectsFromArray:[self additionalRootFolderNames]];
+  if ((b = [self additionalRootFolderNames]) != nil)
+    [m addObjectsFromArray:b];
   return m;
 }
 
diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version
index b96d3027..8fa04cfc 100644
--- a/SOGo/SoObjects/Mailer/Version
+++ b/SOGo/SoObjects/Mailer/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=121
+SUBMINOR_VERSION:=122
 
 # v0.9.114 requires libNGMime       v4.5.229
 # v0.9.114 requires libNGExtensions v4.5.165