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 8fa21c225e9d5b66a4ec45eb7ea58ab9d8667e40..980fea380835100190dade305e5612968b5264cf 100644 (file)
--- 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 c19463f4d358fdd0396e7e72eb1fe0de14afb34e..e7ddbe12b37539a4652aac4730fdd244bc08084b 100644 (file)
--- 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 1fc0a7b27c05ccc7d1a48409ec551e20d54288e9..49c9516fdd5b062c1d8233cb71acfc10f26ad8a7 100644 (file)
--- 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 ac8a27930d39b203d5143f09f0b72f67453c78a2..607664da121c7c465a12e5db9e6f086bb9eea2ae 100644 (file)
--- 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 3dd94823e0a4f081a1ab3ff9668c6dc702a4ea51..0b6e5b107c828492e69c15e77491ce31978a3efb 100644 (file)
--- 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 196d8f937d1bacfc827baf4c0ec3ea6ab379fb15..b85a9306c364b514a4c6cfd5a03537488e7a4b05 100644 (file)
--- 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 ecb7d82673b5731acae4ef259ebf979dd4146d6b..255d8fd4dc3ce6465c44fe74062d0f7f2a3fd129 100644 (file)
--- 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