See ChangeLog

Monotone-Parent: 8d42e44b72c2c9e6431e77f6b5c590736449f7d7
Monotone-Revision: bafccbe12139895411068d388269aca400af46ec

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-04-01T13:49:24
Monotone-Branch: ca.inverse.sogo

UI/Common/UIxPageFrame.m

@@ -26,6 +26,7 @@
 #import <NGObjWeb/WOResourceManager.h>
 
 #import <SoObjects/SOGo/SOGoUser.h>
+#import <SoObjects/SOGo/SOGoUserDefaults.h>
 #import <SoObjects/SOGo/NSDictionary+Utilities.h>
 
 #import <Main/build.h>
@@ -416,10 +417,10 @@ static NSString *siteFavicon = nil;
 
 - (NSString *) userSettings
 {
-  NSUserDefaults *userSettings;
+  SOGoUserDefaults *userSettings;
   NSString *jsonResult;
 
-  userSettings = [[context activeUser] userSettings];
+  userSettings = (SOGoUserDefaults *)[[context activeUser] userSettings];
   if (userSettings)
     jsonResult = [userSettings jsonRepresentation];
   else
@@ -430,10 +431,10 @@ static NSString *siteFavicon = nil;
 
 - (NSString *) userDefaults
 {
-  NSUserDefaults *userDefaults;
+  SOGoUserDefaults *userDefaults;
   NSString *jsonResult;
 
-  userDefaults = [[context activeUser] userDefaults];
+  userDefaults = (SOGoUserDefaults *)[[context activeUser] userDefaults];
   if (userDefaults)
     jsonResult = [userDefaults jsonRepresentation];
   else

UI/Common/UIxToolbar.m

@@ -1,14 +1,15 @@
 /*
+  Copyright (C) 2007-2009 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo 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 Lesser General Public
   License for more details.
@@ -146,14 +147,14 @@
   }
 
   if ((tb = [pathToConfig objectForKey:path]) != nil)
-    return [tb isNotNull] ? tb : nil;
+    return [tb isNotNull] ? (id)tb : nil;
   
   if ((tb = [NSArray arrayWithContentsOfFile:path]) == nil)
     [self errorWithFormat:@"Could not load toolbar resource: %@", _name];
 
   if (pathToConfig == nil)
     pathToConfig = [[NSMutableDictionary alloc] initWithCapacity:32];
-  [pathToConfig setObject:(tb ? tb : (id)[NSNull null]) forKey:path];
+  [pathToConfig setObject:(tb ? (id)tb : (id)[NSNull null]) forKey:path];
 
   return tb;
 }
@@ -163,7 +164,7 @@
   id tb;
   
   if (toolbarConfig != nil)
-    return [toolbarConfig isNotNull] ? toolbarConfig : nil;
+    return [toolbarConfig isNotNull] ? (id)toolbarConfig : nil;
   
   if (toolbar)
     tb = toolbar;

UI/Contacts/UIxContactEditor.m

@@ -626,7 +626,7 @@
 	      if (![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles
 		       onObject: componentAddressBook
 		       inContext: context])
-		ex = [contact moveToFolder: componentAddressBook]; // TODO: handle exception
+		ex = [contact moveToFolder: (SOGoGCSFolder *)componentAddressBook]; // TODO: handle exception
 	    }
 	}
       

UI/Contacts/UIxContactsListViewContainer.m

@@ -1,6 +1,6 @@
 /* UIxContactsListViewContainer.m - this file is part of SOGo
  *
- * Copyright (C) 2006 Inverse inc.
+ * Copyright (C) 2006-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -147,7 +147,7 @@
    [self _setupContext];
    vertical = [moduleSettings objectForKey: @"DragHandleVertical"];
 
-   return ((vertical && [vertical intValue] > 0) ? [vertical stringByAppendingFormat: @"px"] : nil);
+   return ((vertical && [vertical intValue] > 0) ? (id)[vertical stringByAppendingFormat: @"px"] : nil);
 }
 
 - (NSString *) horizontalDragHandleStyle
@@ -157,7 +157,7 @@
    [self _setupContext];
    horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"];
 
-   return ((horizontal && [horizontal intValue] > 0) ? [horizontal stringByAppendingFormat: @"px"] : nil);
+   return ((horizontal && [horizontal intValue] > 0) ? (id)[horizontal stringByAppendingFormat: @"px"] : nil);
 }
 
 - (NSString *) contactsListContentStyle
@@ -167,7 +167,7 @@
   [self _setupContext];
   height = [moduleSettings objectForKey: @"DragHandleVertical"];
 
-   return ((height && [height intValue] > 0) ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
+  return ((height && [height intValue] > 0) ? (id)[NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
 }
 
 @end

UI/MailPartViewers/UIxMailPartAlternativeViewer.m

@@ -1,14 +1,15 @@
 /*
+  Copyright (C) 2007-2009 Inverse inc.
   Copyright (C) 2004 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo 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 Lesser General Public
   License for more details.
@@ -83,7 +84,7 @@
     st = [[[childParts objectAtIndex:i] valueForKey:@"subtype"]
 	               lowercaseString];
     mt = [[mt stringByAppendingString:@"/"] stringByAppendingString:st];
-    [types addObject:mt ? mt : (id)[NSNull null]];
+    [types addObject:mt ? (id)mt : (id)[NSNull null]];
   }
   return types;
 }
@@ -186,8 +187,8 @@
 
   pp = [self partPath];
   return [pp count] > 0
-    ? [pp arrayByAddingObject:[self childPartName]]
-    : [NSArray arrayWithObject:[self childPartName]];
+    ? (id)[pp arrayByAddingObject:[self childPartName]]
+    : (id)[NSArray arrayWithObject:[self childPartName]];
 }
 
 /* nested viewers */

UI/MailPartViewers/UIxMailPartHTMLViewer.m

@@ -1,6 +1,6 @@
 /* UIxMailPartHTMLViewer.m - this file is part of SOGo
  *
- * Copyright (C) 2007, 2008 Inverse inc.
+ * Copyright (C) 2007-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -142,7 +142,7 @@ _xmlCharsetForCharset (NSString *charset)
   return hasExternalImages;
 }
 
-- (BOOL) setUnsafe: (BOOL) b
+- (void) setUnsafe: (BOOL) b
 {
   unsafe = b;
 }

UI/MailPartViewers/UIxMailPartICalActions.m

@@ -166,7 +166,7 @@
 
 	      recurrenceTime = [NSString stringWithFormat: @"%f", 
 					 [[emailEvent recurrenceId] timeIntervalSince1970]];
-	      calendarEvent = [*eventObject lookupOccurence: recurrenceTime];
+	      calendarEvent = (iCalEvent *)[*eventObject lookupOccurence: recurrenceTime];
 	    }
 	  else
 	    calendarEvent = (iCalEvent *) [*eventObject component: NO
@@ -223,7 +223,7 @@
 	{
 	  // We must update main event and all its occurences (if any).
 	  calendar = [eventObject calendar: NO secure: NO];
-	  event = [calendar firstChildWithTag: [eventObject componentTag]];
+	  event = (iCalEvent *)[calendar firstChildWithTag: [eventObject componentTag]];
 	  events = [calendar allObjects];
 	}
       else
@@ -231,11 +231,11 @@
 	  // If recurrenceId is defined, find the specified occurence
 	  // within the repeating vEvent.
 	  recurrenceTime = [NSString stringWithFormat: @"%f", [recurrenceId timeIntervalSince1970]];
-	  event = [eventObject lookupOccurence: recurrenceTime];
+	  event = (iCalEvent *)[eventObject lookupOccurence: recurrenceTime];
 	  
 	  if (event == nil)
 	    // If no occurence found, create one
-	    event = [eventObject newOccurenceWithID: recurrenceTime];
+	    event = (iCalEvent *)[eventObject newOccurenceWithID: recurrenceTime];
 	  
 	  events = [NSArray arrayWithObject: event];
 	}

UI/MailPartViewers/UIxMailPartICalViewer.m

@@ -329,7 +329,7 @@
 	  organizer = [storedEvent organizer];
 	  if (organizer == nil || [organizer isVoid])
 	    {
-	      organizer = [[[storedEvent parent] firstChildWithTag: [storedEventObject componentTag]] organizer];
+	      organizer = [(iCalEntityObject *)[[storedEvent parent] firstChildWithTag: [storedEventObject componentTag]] organizer];
 	      [storedEvent setOrganizer: organizer];
 	    }
 	}

UI/MailPartViewers/UIxMailPartMessageViewer.m

@@ -1,14 +1,15 @@
 /*
+  Copyright (C) 2007-2009 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo 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 Lesser General Public
   License for more details.
@@ -108,8 +109,8 @@
  
   pp = [self partPath];
   return (([pp count] > 0)
-	  ? [pp arrayByAddingObject: @"1"]
-	  : [NSArray arrayWithObject: @"1"]);
+	  ? (id)[pp arrayByAddingObject: @"1"]
+	  : (id)[NSArray arrayWithObject: @"1"]);
 }
 
 - (id) contentViewerComponent

UI/MailPartViewers/UIxMailPartMixedViewer.m

@@ -1,14 +1,15 @@
 /*
+  Copyright (C) 2007-2009 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo 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 Lesser General Public
   License for more details.
@@ -74,8 +75,8 @@
 
   pp = [self partPath];
   return [pp count] > 0
-    ? [pp arrayByAddingObject:[self childPartName]]
-    : [NSArray arrayWithObject:[self childPartName]];
+    ? (id)[pp arrayByAddingObject:[self childPartName]]
+    : (id)[NSArray arrayWithObject:[self childPartName]];
 }
 
 /* nested viewers */

UI/MailPartViewers/UIxMailPartViewer.m

@@ -1,14 +1,15 @@
 /*
+  Copyright (C) 2007-2009 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo 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 Lesser General Public
   License for more details.
@@ -105,7 +106,7 @@
 - (NSData *) flatContent
 {
   if (flatContent != nil)
-    return [flatContent isNotNull] ? flatContent : nil;
+    return [flatContent isNotNull] ? (id)flatContent : nil;
   
   flatContent = 
     [[[context mailRenderingContext] flatContentForPartPath:
@@ -284,8 +285,8 @@
   
   s = [partPath componentsJoinedByString:@"-"];
   return ([s length] > 0)
-    ? [@"untitled-" stringByAppendingString:s]
-    : @"untitled";
+    ? (id)[@"untitled-" stringByAppendingString:s]
+    : (id)@"untitled";
 }
 
 - (NSFormatter *) sizeFormatter

UI/MailPartViewers/UIxMailRenderingContext.m

@@ -1,14 +1,15 @@
 /*
+  Copyright (C) 2007-2009 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo 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 Lesser General Public
   License for more details.
@@ -110,7 +111,7 @@ static BOOL showNamedTextAttachmentsInline = NO;
   NSString *pid;
   NSData *content;
 
-  pid = _partPath ? [_partPath componentsJoinedByString: @"."] : @"";
+  pid = _partPath ? (id)[_partPath componentsJoinedByString: @"."] : (id)@"";
   content = [[self flatContents] objectForKey: pid];
   if (!content && ![pid intValue])
     content = [flatContents objectForKey: @""];

UI/MailerUI/UIxMailEditor.m

@@ -1,16 +1,15 @@
 /*
   Copyright (C) 2004-2005 SKYRIX Software AG
+  Copyright (C) 2008-2009 Inverse inc.
 
-  Copyright (C) 2008 Inverse inc.
+  This file is part of SOGo.
 
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo 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 Lesser General Public
   License for more details.
@@ -52,7 +51,7 @@
 /*
   UIxMailEditor
   
-  An mail editor component which works on SOGoDraftObject's.
+  A mail editor component which works on SOGoDraftObject's.
 */
 
 @interface UIxMailEditor : UIxComponent

UI/MailerUI/UIxMailMainFrame.m

@@ -1,14 +1,15 @@
 /*
+  Copyright (C) 2007-2009 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo 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 Lesser General Public
   License for more details.
@@ -44,6 +45,15 @@
 
 #import "UIxMailMainFrame.h"
 
+// Avoid compilation warnings
+@interface SOGoUserFolder (private)
+
+- (SOGoAppointmentFolders *) privateContacts: (NSString *) key
+				   inContext: (WOContext *) localContext;
+
+@end
+
+
 @implementation UIxMailMainFrame
 
 - (void) _setupContext
@@ -171,8 +181,8 @@
     {
       // Retrieve the email addresses from the specified address book
       // and contact IDs
-      folders = [[[self clientObject] container] privateContacts: @"Contacts"
-						 inContext: nil];
+      folders = (SOGoContactFolders *)[[[self clientObject] container] privateContacts: @"Contacts"
+								       inContext: nil];
       folder = [folders lookupName: folderId
 			inContext: nil
 			acquire: NO];
@@ -266,7 +276,7 @@
    [self _setupContext];
    vertical = [moduleSettings objectForKey: @"DragHandleVertical"];
    
-   return ((vertical && [vertical intValue] > 0) ? [vertical stringByAppendingFormat: @"px"] : nil);
+   return ((vertical && [vertical intValue] > 0) ? (id)[vertical stringByAppendingFormat: @"px"] : nil);
 }
 
 - (NSString *) horizontalDragHandleStyle
@@ -276,7 +286,7 @@
    [self _setupContext];
    horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"];
 
-   return ((horizontal && [horizontal intValue] > 0) ? [horizontal stringByAppendingFormat: @"px"] : nil);
+   return ((horizontal && [horizontal intValue] > 0) ? (id)[horizontal stringByAppendingFormat: @"px"] : nil);
 }
 
 - (NSString *) mailboxContentStyle
@@ -286,7 +296,7 @@
    [self _setupContext];
    height = [moduleSettings objectForKey: @"DragHandleVertical"];
 
-   return ((height && [height intValue] > 0) ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
+   return ((height && [height intValue] > 0) ? (id)[NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
 }
 
 - (WOResponse *) saveDragHandleStateAction

UI/MailerUI/UIxMailMoveToPopUp.m

@@ -1,14 +1,15 @@
 /*
+ Copyright (C) 2007-2009 Inverse inc.
  Copyright (C) 2000-2005 SKYRIX Software AG
  
- This file is part of OpenGroupware.org.
+ This file is part of SOGo.
  
- OGo is free software; you can redistribute it and/or modify it under
+ SOGo is free software; you can redistribute it and/or modify it under
  the terms of the GNU Lesser General Public License as published by the
  Free Software Foundation; either version 2, or (at your option) any
  later version.
  
- OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+ SOGo 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 Lesser General Public
  License for more details.
@@ -106,8 +107,8 @@
   
   e = [[NSMutableDictionary alloc] initWithCapacity:2];
   _pathPrefix = (_pathPrefix == nil)
-    ? title
-    : [NSString stringWithFormat:@"%@.%@", _pathPrefix, title];
+    ? (id)title
+    : (id)[NSString stringWithFormat:@"%@.%@", _pathPrefix, title];
   [e setObject:_pathPrefix forKey:@"title"];
   [e setObject:link        forKey:@"link"];
   [_list addObject:e];

UI/PreferencesUI/UIxPreferences.m

@@ -1,6 +1,6 @@
 /* UIxPreferences.m - this file is part of SOGo
  *
- * Copyright (C) 2007 Inverse inc.
+ * Copyright (C) 2007-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -31,6 +31,7 @@
 #import <SoObjects/SOGo/NSArray+Utilities.h>
 #import <SoObjects/SOGo/NSDictionary+Utilities.h>
 #import <SoObjects/SOGo/SOGoUser.h>
+#import "../../Main/SOGo.h"
 
 #import "UIxPreferences.h"
 

UI/SOGoUI/SOGoACLAdvisory.m

@@ -1,6 +1,6 @@
 /* SOGoACLAdvisory.m - this file is part of SOGo
  *
- * Copyright (C) 2007 Inverse inc.
+ * Copyright (C) 2007-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *

UI/Scheduler/UIxCalDayTable.m

@@ -34,6 +34,8 @@
 #import <SoObjects/SOGo/SOGoDateFormatter.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 
+#import "../../Main/SOGo.h"
+
 #import "UIxCalDayTable.h"
 
 @class SOGoAppointment;

UI/Scheduler/UIxCalMainView.m

@@ -1,6 +1,6 @@
 /* UIxCalMainView.m - this file is part of SOGo
  *
- * Copyright (C) 2006 Inverse inc.
+ * Copyright (C) 2006-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -22,6 +22,7 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSUserDefaults.h>
@@ -126,7 +127,7 @@
   [self _setupContext];
   vertical = [moduleSettings objectForKey: @"DragHandleVertical"];
 
-  return ((vertical && [vertical intValue] > 0) ? [vertical stringByAppendingFormat: @"px"] : nil);
+  return ((vertical && [vertical intValue] > 0) ? (id)[vertical stringByAppendingFormat: @"px"] : nil);
 }
 
 - (NSString *) horizontalDragHandleStyle
@@ -136,7 +137,7 @@
   [self _setupContext];
   horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"];
 
-  return ((horizontal && [horizontal intValue] > 0) ? [horizontal stringByAppendingFormat: @"px"] : nil);
+  return ((horizontal && [horizontal intValue] > 0) ? (id)[horizontal stringByAppendingFormat: @"px"] : nil);
 }
 
 - (NSString *) eventsListViewStyle

UI/Scheduler/UIxComponentEditor.m

@@ -56,6 +56,8 @@
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/SOGo/SOGoPermissions.h>
 
+#import "../../Main/SOGo.h"
+
 #import "UIxComponentEditor.h"
 #import "UIxDatePicker.h"