changed in name lookup

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

diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog
index d89057583c4c7f0a6b9db6d90f062457e46220ef..b8d02601f1724e1c36e159f82a4e15fdba0b9c69 100644 (file)
--- a/SOGo/SoObjects/SOGo/ChangeLog
+++ b/SOGo/SoObjects/SOGo/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-08  Helge Hess  <helge.hess@opengroupware.org>
-
+       
+       * SOGoUserFolder.m: enhanced object lookup so that when a Calendar
+         is opened with an extensions (eg "Calendar.ics") (v0.9.25)
+       
        * SOGoFolder.m: added facility to define default extensions (v0.9.24)
 
        * SOGoObject.m: fixed not implemented return status (501, not 502)

diff --git a/SOGo/SoObjects/SOGo/SOGoUserFolder.m b/SOGo/SoObjects/SOGo/SOGoUserFolder.m
index f0ccb776c50eff576ba4c4f92e20a5a4b80d4f5a..8c16f4af050b65a6ac58076afdc1ea7f91309266 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoUserFolder.m
@@ -154,8 +154,16 @@
   if ((obj = [super lookupName:_key inContext:_ctx acquire:NO]))
     return obj;
   
-  if ([_key isEqualToString:@"Calendar"])
-    return [self privateCalendar:_key inContext:_ctx];
+  if ([_key hasPrefix:@"Calendar"]) {
+    id calendar;
+    
+    calendar = [self privateCalendar:@"Calendar" inContext:_ctx];
+    if ([_key isEqualToString:@"Calendar"])
+      return calendar;
+    
+    return [calendar lookupName:[_key pathExtension] 
+                    inContext:_ctx acquire:NO];
+  }
 
   if ([_key isEqualToString:@"Contacts"])
     return [self privateContacts:_key inContext:_ctx];

diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version
index b110bb31ce7383dfcec38a12568c72e0378c3cb2..886efe19a74a05ae69b4ee133997cd998f712b64 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:=24
+SUBMINOR_VERSION:=25