From 8fdb386bd10f7c8463137e25dd4028dbcda72634 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 4 Jul 2008 18:23:11 +0000
Subject: [PATCH] Monotone-Parent: b63f19817044870bee75b439abf67bc6b7e8ceca
 Monotone-Revision: b4655ce05ca4a96336269d9d01dd4866945c8841

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-07-04T18:23:11
Monotone-Branch: ca.inverse.sogo
---
 SOPE/NGCards/CardGroup.m | 18 +++---------------
 SOPE/NGCards/ChangeLog   |  5 +++++
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/SOPE/NGCards/CardGroup.m b/SOPE/NGCards/CardGroup.m
index d4e92de7a..d1c8c2482 100644
--- a/SOPE/NGCards/CardGroup.m
+++ b/SOPE/NGCards/CardGroup.m
@@ -24,7 +24,6 @@
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
-
 #import <SaxObjC/SaxXMLReader.h>
 #import <SaxObjC/SaxXMLReaderFactory.h>
 
@@ -70,9 +69,7 @@ static NGCardsSaxHandler *sax = nil;
 + (NSArray *) parseFromSource: (id) source
 {
   static id <NSObject,SaxXMLReader> cardParser;
-  NSMutableArray *cardGroups;
-  NSEnumerator *cards;
-  CardGroup *currentCard;
+  NSArray *cardGroups;
 
   cardGroups = nil;
 
@@ -83,18 +80,9 @@ static NGCardsSaxHandler *sax = nil;
 
       if (parser)
 	{
-	  cardGroups = [NSMutableArray new];
-	  [cardGroups autorelease];
-	  
 	  [parser parseFromSource: source];
-	  cards = [[sax cards] objectEnumerator];
-	  
-	  currentCard = [cards nextObject];
-	  while (currentCard)
-	    {
-	      [cardGroups addObject: currentCard];
-	      currentCard = [cards nextObject];
-	    }
+
+	  cardGroups = [sax cards];
 	}
     }
 
diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 2445bcb24..d5eb29030 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* CardGroup.m ([CardGroup +parseFromSource:source]): directly
+	return the result from [sax cards] instead of creating a new array.
+
 2008-07-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* iCalEvent.m ([iCalEvent -endDate]): if no DTEND is specified,