fixed some incompatibility with MacOSX

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

diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog
index 7a48020f69e4a98a4fdf0c35af0e06d2c41f7df3..2b6d4bf0692d8a6990d0d0ab4736951068915a0b 100644 (file)
--- a/SOGo/SoObjects/Mailer/ChangeLog
+++ b/SOGo/SoObjects/Mailer/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-03  Helge Hess  <helge.hess@opengroupware.org>
+
+       * SOGoMailManager.m: improved compatibility with Cocoa Foundation
+         (some weird difference in NGImap4 result processing) (v0.9.77)
+
 2005-02-21  Helge Hess  <helge.hess@opengroupware.org>
 
        * SOGoMailObject.m: generate proper .ics extension for text/calendar

diff --git a/SOGo/SoObjects/Mailer/SOGoMailManager.m b/SOGo/SoObjects/Mailer/SOGoMailManager.m
index 27c6cf9647ce8528e9c29158f708210a251e261c..464877870ea89bf8aadaef1867754248cfe6dbc2 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailManager.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailManager.m
@@ -261,7 +261,12 @@ static NSString       *imap4Separator  = nil;
     /* one entry is the folder itself, so we need at least two */
     return [NSArray array];
   
+#if __APPLE__ 
+  // TODO: somehow results are different on OSX
+  prefixlen = [_fn isEqualToString:@""] ? 0 : [_fn length] + 1;
+#else
   prefixlen = [_fn isEqualToString:@"/"] ? 1 : [_fn length] + 1;
+#endif
   ma = [NSMutableArray arrayWithCapacity:count];
   for (i = 0; i < count; i++) {
     NSString *p;
@@ -269,7 +274,7 @@ static NSString       *imap4Separator  = nil;
     p = [_array objectAtIndex:i];
     if ([p length] <= prefixlen)
       continue;
-    if (![p hasPrefix:_fn])
+    if (prefixlen != 0 && ![p hasPrefix:_fn])
       continue;
     
     /* cut of common part */

diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version
index 455e2d016e288205e3698cd5898d90153e285086..79481ab8b39233d16f56a1c9f0da429ff4453dbf 100644 (file)
--- a/SOGo/SoObjects/Mailer/Version
+++ b/SOGo/SoObjects/Mailer/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=76
+SUBMINOR_VERSION:=77
 
 # v0.9.69 requires libNGMime       v4.5.210
 # v0.9.55 requires libNGExtensions v4.5.136