fixed a MacOS 10.5 issue

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

diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog
index 2bf42ebb2c972510759a553fefb3b5399c7bd53b..9a952ce23d3c69d327a5b4090622eeaf57fd2d23 100644 (file)
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-11  Helge Hess  <helge.hess@opengroupware.org>
+
+       * FdExt.subproj/NSArray+enumerator.m: fixed for MacOS 10.5 (v4.7.201)
+
 2008-02-21  Helge Hess  <helge.hess@opengroupware.org>
 
        * FdExt.subproj/NSString+Escaping.m: fixed a free() bug introduced in

diff --git a/sope-core/NGExtensions/FdExt.subproj/NSArray+enumerator.m b/sope-core/NGExtensions/FdExt.subproj/NSArray+enumerator.m
index de3d66654a59f48ef31915581be16a7f9f426581..8c8a8bb05a9ad3c60e8fa9b91879f8fec0bdb0e8 100644 (file)
--- a/sope-core/NGExtensions/FdExt.subproj/NSArray+enumerator.m
+++ b/sope-core/NGExtensions/FdExt.subproj/NSArray+enumerator.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2008 SKYRIX Software AG
+  Copyright (C) 2008      Helge Hess
 
   This file is part of SOPE.
 
@@ -118,13 +119,26 @@
 @implementation NSMutableArray(enumerator) 
 
 - (id)initWithObjectsFromEnumerator:(NSEnumerator *)_enumerator {
-  if ((self = [self init])) {
+#if NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
+  NSMutableArray *ma = [[NSMutableArray alloc] initWithCapacity:64];
+  id obj;
+
+  while ((obj = [_enumerator nextObject]))
+    [ma addObject:obj];
+
+  self = [self initWithArray:ma];
+  [ma release]; ma = nil;
+  return self;
+#else
+  if ((self = [self init]) != nil) {
     id obj = nil;
      
+    // Does not work on Cocoa because we only have NSCFArray over there ...
     while ((obj = [_enumerator nextObject]))
       [self addObject:obj];
   }
   return self;
+#endif
 }
 
 @end /* NSMutableArray(enumerator)  */

diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version
index 1f300e3b4733e60f4602f3b39f793eff59c43862..9a2efb0b54b33a2f23e584c6271e006c037a872a 100644 (file)
--- a/sope-core/NGExtensions/Version
+++ b/sope-core/NGExtensions/Version
@@ -1,6 +1,6 @@
 # version
 
-SUBMINOR_VERSION:=200
+SUBMINOR_VERSION:=201
 
 # v4.3.115 requires libFoundation v1.0.59
 # v4.2.72  requires libEOControl  v4.2.39