fixed a Cocoa issue with mail connection

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@939 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-core/NGExtensions/NGCalendarDateRange.m b/sope-core/NGExtensions/NGCalendarDateRange.m
index c6b1ce288e59a4af606f7f1f67698d62b96de3cb..3e491fa70308539ca69bbb296716eee1d3b5722f 100644 (file)
--- a/sope-core/NGExtensions/NGCalendarDateRange.m
+++ b/sope-core/NGExtensions/NGCalendarDateRange.m
@@ -196,6 +196,7 @@
 
 @end /* NGCalendarDateRange */
 
+
 @implementation NSArray(NGCalendarDateRanges)
 
 - (NSArray *)arrayByCreatingDateRangesFromObjectsWithStartDateKey:(NSString *)s

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index 177c8e6a51f18c891071cc4e9675f2d49b77717b..6934267c07a9a3e6c05d53ad8e367deb409f856a 100644 (file)
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-26  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGImap4: fixed a compatibility issue with Cocoa (v4.5.230)
+
 2005-07-20  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGMime, NGMail: added some convinience methods to access the header

diff --git a/sope-mime/NGImap4/ChangeLog b/sope-mime/NGImap4/ChangeLog
index 07a6ffce8968f89e96b487c7312b636adb213775..50d8c482a2bddd70c1da2a0a7ed229db5ee85903 100644 (file)
--- a/sope-mime/NGImap4/ChangeLog
+++ b/sope-mime/NGImap4/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-26  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGImap4Connection.m: fixed a Cocoa compatibility issue with
+         -doesMailboxExistAtURL
+
 2005-07-15  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGImap4ResponseParser.m: fixed a bug in parsing mailbox names in ACL

diff --git a/sope-mime/NGImap4/NGImap4Connection.m b/sope-mime/NGImap4/NGImap4Connection.m
index 1b7078a6b720fefe032d0fb0c737a24b0a72a985..f7a96d8a4f71acabb74ba15feba4d03d872da57a 100644 (file)
--- a/sope-mime/NGImap4/NGImap4Connection.m
+++ b/sope-mime/NGImap4/NGImap4Connection.m
@@ -719,12 +719,20 @@ NSArray *SOGoMailGetDirectChildren(NSArray *_array, NSString *_fn) {
 - (BOOL)doesMailboxExistAtURL:(NSURL *)_url {
   NSString *folderName;
   id result;
-  
+
   /* check in hierarchy cache */
   
   if ((result = [self cachedHierarchyResults]) != nil) {
+    NSString *p;
+    
     result = [result objectForKey:@"list"];
-    return ([result objectForKey:[_url path]] != nil) ? YES : NO;
+    p      = [_url path];
+#if __APPLE__ 
+    /* normalized results already have the / in front on libFoundation?! */
+    if ([p hasPrefix:@"/"]) 
+      p = [p substringFromIndex:1];
+#endif
+    return ([result objectForKey:p] != nil) ? YES : NO;
   }
   
   /* check using IMAP4 select */

diff --git a/sope-mime/Version b/sope-mime/Version
index 6a6dd3ab354053201ed6a45b2726d30a527e428e..ff670ea8fae2cb05cf7ad0f9cbee1c06bae2e79b 100644 (file)
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=5
-SUBMINOR_VERSION:=229
+SUBMINOR_VERSION:=230
 
 # v4.5.214 requires libNGExtensions v4.5.146
 # v4.2.149 requires libNGStreams    v4.2.34