From b65772bbff2a4f952cb1f705d9446bb6e93e33cd Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 22 Oct 2007 21:52:13 +0000
Subject: [PATCH] Monotone-Parent: 9bd3efbf4f547d824498717029033f28648869c2
 Monotone-Revision: eb77dd31037c7227b99cc8b6f61c1385e1bf0468

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-10-22T21:52:13
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/SOGo/SOGoFolder.m | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index 286974476..4ff6d1e23 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -259,23 +259,24 @@ static NSString *defaultUserID = @"<default>";
 
 - (void) sendFolderAdvisoryTemplate: (NSString *) template
 {
-  NSString *language, *pageName;
+  NSString *pageName;
   SOGoUser *user;
   SOGoFolderAdvisory *page;
-  WOApplication *app;
 
-  user = [SOGoUser userWithLogin: [[context activeUser] login] roles: nil];
-  language = [user language];
+  user = [context activeUser];
   pageName = [NSString stringWithFormat: @"SOGoFolder%@%@Advisory",
-		       language, template];
+		       [user language], template];
 
-  app = [WOApplication application];
-  page = [app pageWithName: pageName inContext: context];
+  page = [[WOApplication application] pageWithName: pageName
+				      inContext: context];
   [page setFolderObject: self];
-  [page setRecipientUID: [[context activeUser] login]];
+  [page setRecipientUID: [user login]];
   [page send];
 }
 
+
+//   if (!result) [self sendFolderAdvisoryTemplate: @"Addition"];
+
 - (BOOL) create
 {
   NSException *result;
@@ -284,8 +285,6 @@ static NSString *defaultUserID = @"<default>";
 				 withName: displayName
                                  atPath: ocsPath];
 
-  if (!result) [self sendFolderAdvisoryTemplate: @"Addition"];
-
   return (result == nil);
 }
 
@@ -302,11 +301,11 @@ static NSString *defaultUserID = @"<default>";
   else
     error = [[self folderManager] deleteFolderAtPath: ocsPath];
 
-  if (!error) [self sendFolderAdvisoryTemplate: @"Removal"];
-
   return error;
 }
 
+//   if (!error) [self sendFolderAdvisoryTemplate: @"Removal"];
+
 - (void) renameTo: (NSString *) newName
 {
   GCSChannelManager *cm;