From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Wed, 8 Sep 2004 18:48:25 +0000 (+0000)
Subject: fixed some issue with -sleep
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e2ae36de755a52a6d1cafc9babf5f5bfd27ed21;p=scalable-opengroupware.org

fixed some issue with -sleep


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

diff --git a/SOGo/SoObjects/Appointments/ChangeLog b/SOGo/SoObjects/Appointments/ChangeLog
index 8fa21c22..980fea38 100644
--- a/SOGo/SoObjects/Appointments/ChangeLog
+++ b/SOGo/SoObjects/Appointments/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-08    <helge@agenor.opengroupware.org>
+
+	* SOGoGroupAppointmentFolder.m: do not call -sleep in fetch method
+	  (disconnects the folder from the parent folder), instead added a
+	  -resetFolderCaches methods which performs some cleanups before a
+	  fetch (v0.9.11)
+
 2004-08-16  Helge Hess  <helge.hess@skyrix.com>
 
 	* SOGoAppointmentFolder.m: added method to create a group folder and
diff --git a/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
index c19463f4..e7ddbe12 100644
--- a/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
+++ b/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
@@ -44,6 +44,10 @@
 
 /* folders */
 
+- (void)resetFolderCaches {
+  [self->uidToFolder release]; self->uidToFolder = nil;
+}
+
 - (SOGoAppointmentFolder *)folderForUID:(NSString *)_uid {
   if (self->uidToFolder == nil) {
     // TODO: can we trigger a fetch?
@@ -123,7 +127,7 @@
   NSMutableDictionary *uidToRecord;
   unsigned i, count;
   
-  [self sleep];
+  [self resetFolderCaches];
   
   if ((count = [_folders count]) == 0)
     return [NSArray array];
diff --git a/SOGo/SoObjects/Appointments/Version b/SOGo/SoObjects/Appointments/Version
index 1fc0a7b2..49c9516f 100644
--- a/SOGo/SoObjects/Appointments/Version
+++ b/SOGo/SoObjects/Appointments/Version
@@ -1,3 +1,3 @@
 # $Id: Version,v 1.9 2004/05/19 14:30:45 helge Exp $
 
-SUBMINOR_VERSION:=10
+SUBMINOR_VERSION:=11
diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index ac8a2793..607664da 100644
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-08    <helge@agenor.opengroupware.org>
+
+	* SOGoGroupFolder.m: separate -resetFolderCaches method from -sleep
+	  (v0.9.16)
+
 2004-09-08  Helge Hess  <helge.hess@skyrix.com>
 
 	* SOGoUserFolder.m: map "Mail" key to SOGoMailAccounts object (v0.9.15)
diff --git a/SOGo/SoObjects/SOGo/SOGoGroupFolder.h b/SOGo/SoObjects/SOGo/SOGoGroupFolder.h
index 3dd94823..0b6e5b10 100644
--- a/SOGo/SoObjects/SOGo/SOGoGroupFolder.h
+++ b/SOGo/SoObjects/SOGo/SOGoGroupFolder.h
@@ -48,6 +48,7 @@
 - (NSArray *)memberFolders;
 - (id)folderForUID:(NSString *)_uid;
 
+- (void)resetFolderCaches;
 - (void)sleep;
 
 /* pathes */
diff --git a/SOGo/SoObjects/SOGo/SOGoGroupFolder.m b/SOGo/SoObjects/SOGo/SOGoGroupFolder.m
index 196d8f93..b85a9306 100644
--- a/SOGo/SoObjects/SOGo/SOGoGroupFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoGroupFolder.m
@@ -123,9 +123,12 @@
   return [self->uidToFolder objectForKey:_uid];
 }
 
-- (void)sleep {
+- (void)resetFolderCaches {
   [self->uidToFolder release]; self->uidToFolder = nil;
   [self->folders     release]; self->folders     = nil;
+}
+- (void)sleep {
+  [self resetFolderCaches];
   [super sleep];
 }
 
diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index ecb7d826..255d8fd4 100644
--- a/SOGo/SoObjects/SOGo/Version
+++ b/SOGo/SoObjects/SOGo/Version
@@ -1,3 +1,3 @@
 # $Id: Version 170 2004-08-11 10:45:40Z helge $
 
-SUBMINOR_VERSION:=15
+SUBMINOR_VERSION:=16