From bb93bf4f9aafa1a0167ddd261226fa07e2a82168 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 8 Nov 2007 19:56:55 +0000
Subject: [PATCH] Monotone-Parent: 0d487a0e7d301ad5f2aedda008c41843eca204d8
 Monotone-Revision: 1f46dbc903f7ca9ba9cc8ce7548e8dcc424e109e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-08T19:56:55
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                         | 5 +++++
 SoObjects/SOGo/SOGoParentFolder.m | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ccf0492f..fddc5fa7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-11-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoParentFolder.m ([SOGoParentFolder
+	-newFolderWithName:nameandNameInContainer:newNameInContainer]):
+	fixed method to make use of the parameters instead of the useless
+	remains that weren't even initialized.
+
 	* SoObjects/Appointments/SOGoAppointmentObject.m
 	([SOGoAppointmentObject -saveContentString:_iCalbaseSequence:_v]):
 	don't propagate the event among the attendees if this is not an
diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m
index b71a0f0c5..c2b5c9b34 100644
--- a/SoObjects/SOGo/SOGoParentFolder.m
+++ b/SoObjects/SOGo/SOGoParentFolder.m
@@ -196,24 +196,24 @@
 - (NSException *) newFolderWithName: (NSString *) name
 		 andNameInContainer: (NSString *) newNameInContainer
 {
-  NSString *newFolderID;
   SOGoGCSFolder *newFolder;
   NSException *error;
 
   if (!subFolderClass)
     subFolderClass = [[self class] subFolderClass];
 
-  newFolder = [subFolderClass objectWithName: newFolderID inContainer: self];
+  newFolder = [subFolderClass objectWithName: newNameInContainer
+			      inContainer: self];
   if ([newFolder isKindOfClass: [NSException class]])
     error = (NSException *) newFolder;
   else
     {
       [newFolder setDisplayName: name];
       [newFolder setOCSPath: [NSString stringWithFormat: @"%@/%@",
-                                       OCSPath, newFolderID]];
+                                       OCSPath, newNameInContainer]];
       if ([newFolder create])
 	{
-	  [subFolders setObject: newFolder forKey: name];
+	  [subFolders setObject: newFolder forKey: newNameInContainer];
 	  error = nil;
 	}
       else