From 2371cff64d8dd9a72e762a72855e59549a52f6b9 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 11 Oct 2006 18:58:16 +0000
Subject: [PATCH] Monotone-Parent: 510d3e8a2a93557f4bdd594453d09b724e3b54d7
 Monotone-Revision: 518a252eefb451370d15b31bc6d67a5ed151f521

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-11T18:58:16
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     |  3 ++
 SoObjects/Appointments/NSArray+Appointments.h | 37 ++++++++++++++++
 SoObjects/Appointments/NSArray+Appointments.m | 41 ++++++++++++++++++
 .../Appointments/SOGoAppointmentObject.m      | 42 ++++++-------------
 4 files changed, 93 insertions(+), 30 deletions(-)
 create mode 100644 SoObjects/Appointments/NSArray+Appointments.h
 create mode 100644 SoObjects/Appointments/NSArray+Appointments.m

diff --git a/ChangeLog b/ChangeLog
index d594e6b9c..352e91516 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/NSArray+Appointments.[hm]: category
+	extracted from SOGoAppointmentObject.
+
 	* UI/Scheduler/UIxAppointmentEditor.m ([UIxAppointmentEditor
 	-saveUrl]): returns the url needed to POST the new form to.
 	redirect the user to <aptid>/editAsAppointment instead of /edit,
diff --git a/SoObjects/Appointments/NSArray+Appointments.h b/SoObjects/Appointments/NSArray+Appointments.h
new file mode 100644
index 000000000..03fd2c31c
--- /dev/null
+++ b/SoObjects/Appointments/NSArray+Appointments.h
@@ -0,0 +1,37 @@
+/* NSArray+Appointments.h - this file is part of SOGo
+ *
+ * Copyright (C) 2006 Inverse groupe conseil
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef NSARRAY_APPOINTMENTS_H
+#define NSARRAY_APPOINTMENTS_H
+
+#import <Foundation/NSArray.h>
+
+@class iCalPerson;
+
+@interface NSMutableArray (iCalPersonConvenience)
+
+- (void) removePerson: (iCalPerson *) _person;
+
+@end
+
+
+#endif /* NSARRAY+APPOINTMENTS_H */
diff --git a/SoObjects/Appointments/NSArray+Appointments.m b/SoObjects/Appointments/NSArray+Appointments.m
new file mode 100644
index 000000000..7f0f91145
--- /dev/null
+++ b/SoObjects/Appointments/NSArray+Appointments.m
@@ -0,0 +1,41 @@
+/* NSArray+Appointments.m - this file is part of SOGo
+ *
+ * Copyright (C) 2006 Inverse groupe conseil
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#import <NGCards/iCalPerson.h>
+
+#import "NSArray+Appointments.h"
+
+@implementation NSMutableArray (iCalPersonConvenience)
+
+- (void)removePerson: (iCalPerson *)_person {
+  int i;
+  
+  for (i = [self count] - 1; i >= 0; i--) {
+    iCalPerson *p;
+    
+    p = [self objectAtIndex:i];
+    if ([p hasSameEmailAddress:_person])
+      [self removeObjectAtIndex:i];
+  }
+}
+
+@end
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 8e58c453f..1e63cc1bc 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -19,22 +19,20 @@
   02111-1307, USA.
 */
 
-#include "SOGoAppointmentObject.h"
+#import "SOGoAppointmentObject.h"
 
-#include <SOGo/AgenorUserManager.h>
-#include <SaxObjC/SaxObjC.h>
-#include <NGCards/NGCards.h>
-#include <NGCards/iCalCalendar.h>
-#include <NGCards/iCalEvent.h>
-#include <NGMime/NGMime.h>
-#include <NGMail/NGMail.h>
-#include <NGMail/NGSendMail.h>
-#include "SOGoAptMailNotification.h"
-#include "common.h"
+#import <SOGo/AgenorUserManager.h>
+#import <SaxObjC/SaxObjC.h>
+#import <NGCards/NGCards.h>
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalEvent.h>
+#import <NGMime/NGMime.h>
+#import <NGMail/NGMail.h>
+#import <NGMail/NGSendMail.h>
+#import "SOGoAptMailNotification.h"
+#import "common.h"
 
-@interface NSMutableArray (iCalPersonConvenience)
-- (void)removePerson:(iCalPerson *)_person;
-@end
+#import "NSArray+Appointments.h"
 
 @interface SOGoAppointmentObject (PrivateAPI)
 - (NSString *)homePageURLForPerson:(iCalPerson *)_person;
@@ -786,19 +784,3 @@ static NSString                  *mailTemplateDefaultLanguage = nil;
 }
 
 @end /* SOGoAppointmentObject */
-
-@implementation NSMutableArray (iCalPersonConvenience)
-
-- (void)removePerson:(iCalPerson *)_person {
-  int i;
-  
-  for (i = [self count] - 1; i >= 0; i--) {
-    iCalPerson *p;
-    
-    p = [self objectAtIndex:i];
-    if ([p hasSameEmailAddress:_person])
-      [self removeObjectAtIndex:i];
-  }
-}
-
-@end /* NSMutableArray (iCalPersonConvenience) */