see changelog

Monotone-Parent: 399ddcc3b0b509af5a4d05cd434475774187e48c
Monotone-Revision: 0cee430f2a0dfc64e4d3616db2934929c59abbbf

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2007-12-03T14:13:10
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoGCSFolder.m

@@ -55,9 +55,18 @@
 #import "SOGoGCSFolder.h"
 
 static NSString *defaultUserID = @"<default>";
+static BOOL sendFolderAdvisories = NO;
 
 @implementation SOGoGCSFolder
 
++ (void) initialize
+{
+  NSUserDefaults *ud;
+
+  ud = [NSUserDefaults standardUserDefaults];
+  sendFolderAdvisories = [ud boolForKey: @"SOGoFoldersSendEMailNotifications"];
+}
+
 + (id) folderWithSubscriptionReference: (NSString *) reference
 			   inContainer: (id) aContainer
 {
@@ -254,8 +263,6 @@ static NSString *defaultUserID = @"<default>";
   [page send];
 }
 
-//   if (!result) [self sendFolderAdvisoryTemplate: @"Addition"];
-
 - (BOOL) create
 {
   NSException *result;
@@ -264,6 +271,8 @@ static NSString *defaultUserID = @"<default>";
 				 withName: displayName
                                  atPath: ocsPath];
 
+  if (!result && sendFolderAdvisories) [self sendFolderAdvisoryTemplate: @"Addition"];
+
   return (result == nil);
 }
 
@@ -280,11 +289,11 @@ static NSString *defaultUserID = @"<default>";
   else
     error = [[self folderManager] deleteFolderAtPath: ocsPath];
 
+  if (!error && sendFolderAdvisories) [self sendFolderAdvisoryTemplate: @"Removal"];
+
   return error;
 }
 
-//   if (!error) [self sendFolderAdvisoryTemplate: @"Removal"];
-
 - (void) renameTo: (NSString *) newName
 {
   GCSChannelManager *cm;