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 c8441cca9d00748df6778ae771fab09b9d44c314..9bb16810998a7e1b9859e7b6f4e0a97ab490e269 100644 (file)
--- 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 03d8478b5bcd7f62a959c7a5384838947e817693..bcb0ea6b74958530a92f0b7777a28b380031cdc2 100644 (file)
--- 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 08969d73505b6de993d4345306973859fcdb7782..27326638d910dda4bc62e4b56d239b4be5067c42 100644 (file)
--- 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 b96d302726fc19c4a6b15ce266f51e3043753574..8fa04cfc46422e83dc3b36d502469e586c587d68 100644 (file)
--- 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