Monotone-Parent: 46747edd0dcb4ecc9b939b9c8be25185efe65144

Monotone-Revision: 772069a4679fa8b05adc4dc49b2087230a05669c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-12-17T15:29:06
Monotone-Branch: ca.inverse.sogo

UI/MailPartViewers/UIxMailPartICalViewer.m

@@ -92,7 +92,7 @@
 
 - (BOOL) couldParseCalendar
 {
-  return (([self inCalendar]));
+  return ([self inCalendar] != nil);
 }
 
 - (iCalEvent *) inEvent
@@ -246,7 +246,7 @@
 
 - (BOOL) isEventStoredInCalendar
 {
-  return (([self storedEventObject]));
+  return ([self storedEventObject] != nil);
 }
 
 - (iCalEvent *) storedEvent
@@ -376,7 +376,7 @@
 
 - (BOOL) isReplySenderAnAttendee
 {
-  return (([self storedReplyAttendee]));
+  return ([self storedReplyAttendee] != nil);
 }
 
 - (iCalPerson *) _emailParticipantWithEvent: (iCalEvent *) event

UI/MailerUI/UIxMailMainFrame.m

@@ -20,8 +20,10 @@
 */
 
 #import <Foundation/NSUserDefaults.h>
+
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/SoComponent.h>
 #import <NGExtensions/NSString+misc.h>
 

UI/SOGoUI/SOGoACLAdvisory.h

@@ -59,6 +59,12 @@
 
 @end
 
+@interface SOGoACLModificationAdvisory : SOGoACLAdvisory
+
+- (NSString *) aclMethod;
+
+@end
+
 @interface SOGoACLEnglishAdditionAdvisory : SOGoACLAdditionAdvisory
 @end
 
@@ -68,13 +74,13 @@
 @interface SOGoACLGermanAdditionAdvisory : SOGoACLAdditionAdvisory
 @end
 
-@interface SOGoACLEnglishModificationAdvisory : SOGoACLAdditionAdvisory
+@interface SOGoACLEnglishModificationAdvisory : SOGoACLModificationAdvisory
 @end
 
-@interface SOGoACLFrenchModificationAdvisory : SOGoACLAdditionAdvisory
+@interface SOGoACLFrenchModificationAdvisory : SOGoACLModificationAdvisory
 @end
 
-@interface SOGoACLGermanModificationAdvisory : SOGoACLAdditionAdvisory
+@interface SOGoACLGermanModificationAdvisory : SOGoACLModificationAdvisory
 @end
 
 @interface SOGoACLEnglishRemovalAdvisory : SOGoACLRemovalAdvisory

UI/SOGoUI/SOGoACLAdvisory.m

@@ -20,6 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSURL.h>
+
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NGHashMap.h>
 #import <NGMail/NGMimeMessage.h>

UI/Scheduler/UIxAppointmentEditor.m

@@ -24,6 +24,7 @@
 
 #import <NGObjWeb/SoObject.h>
 #import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 

UI/Scheduler/UIxCalListingActions.m

@@ -344,7 +344,8 @@
       [newEvent addObject: [self _formattedDateForSeconds: interval
 				 forAllDay: isAllDay]];
 
-      participants = state = nil;
+      participants = nil;
+      state = nil;
       if ([[oldEvent objectAtIndex: 9] length] > 0 &&
 	  [[oldEvent objectAtIndex: 10] length] > 0) {
 	participants = [[oldEvent objectAtIndex: 9] componentsSeparatedByString: @"\n"];
@@ -389,7 +390,7 @@
   
   ascending = [[context request] formValueForKey: @"asc"];
   if (![ascending boolValue])
-    newEvents = [newEvents reversedArray];
+    [newEvents reverseArray];
 
   return [self _responseWithData: newEvents];
 }

UI/Scheduler/UIxCalView.m

@@ -1,8 +1,30 @@
+/* UIxCalMainView.m - this file is part of SOGo
+ *
+ * Copyright (C) 2006, 2007 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 <OGoContentStore/OCSFolder.h>
 
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/SoUser.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NGCalendarDateRange.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSNull+misc.h>

UI/Scheduler/UIxTaskEditor.m

@@ -22,6 +22,7 @@
 
 #import <NGObjWeb/SoObject.h>
 #import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGExtensions/NSCalendarDate+misc.h>