fixed OGo bug #1893

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

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index 1e78f72712e7cd7f10dba6db10c1461c13cb9a3d..b4915415373ef61e3218f973625d05e3c0b645d0 100644 (file)
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-01  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>
+
+       * NGImap4: fixed some gstep-base issue (OGo bug #1893) (v4.7.252)
+
 2007-08-01  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>
 
        * NGImap4: added support for bodystructure fetches (fixes OGo bug

diff --git a/sope-mime/NGImap4/ChangeLog b/sope-mime/NGImap4/ChangeLog
index a276a69cd96a14cf4258c38f1737861096e9fd0c..e3afe0120b89e0e6c6a74f4717fbc3485a35635d 100644 (file)
--- a/sope-mime/NGImap4/ChangeLog
+++ b/sope-mime/NGImap4/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-14  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGImap4Connection.m: fixed some issue with gnustep-base and the
+         first char of a subfolder name (fixes OGo bug #1893)
+
 2007-08-01  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>
 
        * NGImap4ResponseParser.m: added support for bodystructure fetches

diff --git a/sope-mime/NGImap4/NGImap4Connection.m b/sope-mime/NGImap4/NGImap4Connection.m
index fb2a2c045bdecb76843d60fcb000bac89140a84d..00c8a9cb2664e07588cf21a136aeab6d0ea6f7ba 100644 (file)
--- a/sope-mime/NGImap4/NGImap4Connection.m
+++ b/sope-mime/NGImap4/NGImap4Connection.m
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2004-2005 SKYRIX Software AG
+  Copyright (C) 2004-2007 SKYRIX Software AG
 
   This file is part of OpenGroupware.org.
 
@@ -215,13 +215,18 @@ NSArray *SOGoMailGetDirectChildren(NSArray *_array, NSString *_fn) {
   NSMutableArray *ma;
   unsigned i, count, prefixlen;
   
-  if ((count = [_array count]) < 2)
+  if ((count = [_array count]) < 2) {
     /* one entry is the folder itself, so we need at least two */
     return [NSArray array];
+  }
   
-#if __APPLE__ 
   // TODO: somehow results are different on OSX
+  // we should investigate and test all Foundation libraries and document the
+  // differences
+#if __APPLE__ 
   prefixlen = [_fn isEqualToString:@""] ? 0 : [_fn length] + 1;
+#elif GNUSTEP_BASE_LIBRARY
+  prefixlen = [_fn isEqualToString:@"/"] ? 1 : [_fn length];
 #else
   prefixlen = [_fn isEqualToString:@"/"] ? 1 : [_fn length] + 1;
 #endif

diff --git a/sope-mime/Version b/sope-mime/Version
index 15a7ba9768d81671df2f1a87def482eeb93d9b60..6dc001e9aab500cfea423efd359ca4ee406b8f99 100644 (file)
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=7
-SUBMINOR_VERSION:=251
+SUBMINOR_VERSION:=252
 
 # v4.5.214 requires libNGExtensions v4.5.146
 # v4.2.149 requires libNGStreams    v4.2.34