merge of '1d1c945ea058db7070c9b83c4c2bb60689c52f92'

and '74d6ae3bf39677a7d5083301f1c29c74b97b84dd' Monotone-Parent: 1d1c945ea058db7070c9b83c4c2bb60689c52f92 Monotone-Parent: 74d6ae3bf39677a7d5083301f1c29c74b97b84dd Monotone-Revision: b5081fb240f719d3a1ce2583dff3738a9ceb9d93 Monotone-Author: crobert@inverse.ca Monotone-Date: 2008-09-28T19:49:39 Monotone-Branch: ca.inverse.sogo
2026-07-12 11:55:09 +00:00 · 2008-09-28 19:49:39 +00:00
parent a828b049de 6d10c61582
commit 08ff1428cc
258 changed files with 1261 additions and 582 deletions
@@ -1,6 +1,6 @@
 /* UIxAclEditor.h - this file is part of SOGo
 *
- * Copyright (C) 2006, 2007 Inverse groupe conseil
+ * Copyright (C) 2006, 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxAclEditor.m - this file is part of SOGo
 *
- * Copyright (C) 2006, 2007 Inverse groupe conseil
+ * Copyright (C) 2006, 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxFolderActions.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxFolderActions.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxJSClose.h - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxJSClose.m - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxObjectActions.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxObjectActions.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxParentFolderActions.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxParentFolderActions.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxUserRightsEditor.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxUserRightsEditor.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* WODirectAction+SOGo.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* WODirectAction+SOGo.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxContactFoldersView.h - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxContactFoldersView.m - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxContactsListViewContainer.h - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxContactsListViewContainer.m - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxContactsUserFolders.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxContactsUserFolders.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxContactsUserRightsEditor.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxContactsUserRightsEditor.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxListEditor.h - this file is part of SOGo
 *
- * Copyright (C) 2008 Inverse groupe conseil
+ * Copyright (C) 2008 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxListEditor.m - this file is part of SOGo
 *
- * Copyright (C) 2008 Inverse groupe conseil
+ * Copyright (C) 2008 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxListView.h - this file is part of SOGo
 *
- * Copyright (C) 2008 Inverse groupe conseil
+ * Copyright (C) 2008 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxListView.m - this file is part of SOGo
 *
- * Copyright (C) 2008 Inverse groupe conseil
+ * Copyright (C) 2008 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailPartHTMLViewer.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailPartHTMLViewer.m - this file is part of SOGo
 *
- * Copyright (C) 2007, 2008 Inverse groupe conseil
+ * Copyright (C) 2007, 2008 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailPartICalActions.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailPartICalActions.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailPartTextViewer.h - this file is part of $PROJECT_NAME_HERE$
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -79,6 +79,12 @@

 "Edit Draft..." = "Concept aanpassen...";

+"highest" = "Highest";
+"high" = "High";
+"normal" = "Normal";
+"low" = "Low";
+"lowest" = "Lowest";
+
 "This mail is being sent from an unsecure network!" = "Deze e-mail wordt verzonden vanaf een onveilig netwerk!";

 /* Popup "show" */
@@ -92,10 +92,15 @@
 "bcc"           = "Bcc";

 "Addressbook"   = "Address Book";
-"Anais"         = "Anais";

 "Edit Draft..." = "Edit Draft...";

+"highest" = "Highest";
+"high" = "High";
+"normal" = "Normal";
+"low" = "Low";
+"lowest" = "Lowest";
+
 "This mail is being sent from an unsecure network!" = "This mail is being sent from an unsecure network!";

 /* Popup "show" */
@@ -96,6 +96,12 @@

 "Edit Draft..." = "Modifier le brouillon...";

+"highest" = "Maximale";
+"high" = "Haute";
+"normal" = "Normale";
+"low" = "Basse";
+"lowest" = "Minimale";
+
 "This mail is being sent from an unsecure network!" = "Ce mail est envoyé depuis un réseau non sécurisé !";

 /* Popup "show" */
@@ -80,6 +80,12 @@

 "Edit Draft..." = "Entwurf bearbeiten...";

+"highest" = "Highest";
+"high" = "High";
+"normal" = "Normal";
+"low" = "Low";
+"lowest" = "Lowest";
+
 "This mail is being sent from an unsecure network!" = "Diese e-Mail wurde von einem unsicheren Netzwerk gesendet!";

 /* Popup "show" */
@@ -102,6 +102,12 @@

 "Edit Draft..." = "Modifica bozza...";

+"highest" = "Highest";
+"high" = "High";
+"normal" = "Normal";
+"low" = "Low";
+"lowest" = "Lowest";
+
 "This mail is being sent from an unsecure network!" = "Questa email è stata spedita da un network contrassegnato come non sicuro!";

 /* Popup "show" */
@@ -99,6 +99,12 @@

 "Edit Draft..." = "Modificar borrador...";

+"highest" = "Highest";
+"high" = "High";
+"normal" = "Normal";
+"low" = "Low";
+"lowest" = "Lowest";
+
 "This mail is being sent from an unsecure network!" = "Este mendaje es enviado desde una red no segura.";

 /* Popup "show" */
@@ -27,5 +27,10 @@
      cssClass = "tbicon_save";
      label = "Save";
      tooltip = "Save this message"; },
+    { link = "#";
+      hasMenu = YES;
+      label = "Priority";
+      onclick = "return onSelectPriority(event);";
+      image = "priority.png"; },
  )
 )
@@ -1,6 +1,6 @@
 /* UIxMailAccountActions.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailAccountActions.m - this file is part of SOGo
 *
- * Copyright (C) 2007, 2008 Inverse groupe conseil
+ * Copyright (C) 2007, 2008 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailActions.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailActions.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,8 @@
 /*
  Copyright (C) 2004-2005 SKYRIX Software AG

+  Copyright (C) 2008 Inverse inc.
+
  This file is part of OpenGroupware.org.

  OGo is free software; you can redistribute it and/or modify it under
@@ -64,6 +66,9 @@
  NSString *from;
  SOGoMailFolder *sentFolder;

+  NSString *priority;
+  id item;
+
  /* these are for the inline attachment list */
  NSString *attachmentName;
  NSArray  *attachmentNames;
@@ -85,7 +90,7 @@ static NSArray *infoKeys = nil;
  infoKeys = [[NSArray alloc] initWithObjects:
 				@"subject", @"to", @"cc", @"bcc", 
 			      @"from", @"replyTo", @"inReplyTo",
-			      nil];
+			      @"priority", nil];
  
  /* Internet mail settings */
  
@@ -100,8 +105,20 @@ static NSArray *infoKeys = nil;
 	[internetMailHeaders count]);
 }

+- (id) init
+{
+  if ((self = [super init]))
+    {
+      [self setPriority: @"NORMAL"];
+    }
+  
+  return self;
+}
+
 - (void) dealloc
 {
+  [item release];
+  [priority release];
  [sentFolder release];
  [fromEMails release];
  [from release];
@@ -117,6 +134,45 @@ static NSArray *infoKeys = nil;
 }

 /* accessors */
+- (void) setItem: (id) _item
+{
+  ASSIGN (item, _item);
+}
+
+- (id) item
+{
+  return item;
+}
+
+- (NSArray *) priorityClasses
+{
+  static NSArray *priorities = nil;
+  
+  if (!priorities)
+    {
+      priorities = [NSArray arrayWithObjects: @"HIGHEST", @"HIGH",
+                            @"NORMAL", @"LOW", @"LOWEST", nil];
+      [priorities retain];
+    }
+
+  return priorities;
+}
+
+- (void) setPriority: (NSString *) _priority
+{
+  ASSIGN(priority, _priority);
+}
+
+- (NSString *) priority
+{
+  return priority;
+}
+
+- (NSString *) itemPriorityText
+{
+  return [self labelForKey: [NSString stringWithFormat: @"%@", [item lowercaseString]]];
+}
+
 - (NSString *) isMailReply
 {
  return ([to count] > 0 ? @"true" : @"false");
@@ -1,6 +1,6 @@
 /* UIxMailFolderActions.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -27,6 +27,7 @@
 */

 #import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSCharacterSet.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSTimeZone.h>
@@ -104,6 +105,55 @@
  return [dateFormatter formattedDateAndTime: messageDate];
 }

+//
+// Priorities are defined like this:
+//
+// X-Priority: 1 (Highest)
+// X-Priority: 2 (High)
+// X-Priority: 3 (Normal)
+// X-Priority: 4 (Low)
+// X-Priority: 5 (Lowest)
+//
+// Sometimes, the MUAs don't send over the string in () so we ignore it.
+//
+- (NSString *) messagePriority
+{
+  NSString *result;
+  NSData *data;
+    
+  data = [message objectForKey: @"header"];
+  result = @"";
+
+  if (data)
+    {
+      NSString *s;
+      
+      s = [[NSString alloc] initWithData: data
+			    encoding: NSASCIIStringEncoding];
+
+      if (s)
+	{
+	  NSRange r;
+
+	  [s autorelease];
+	  r = [s rangeOfString: @":"];
+
+	  if (r.length)
+	    {
+	      s = [[s substringFromIndex: r.location+1]
+		    stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
+
+	      if ([s hasPrefix: @"1"]) result = [self labelForKey: @"highest"];
+	      else if ([s hasPrefix: @"2"]) result = [self labelForKey: @"high"];
+	      else if ([s hasPrefix: @"4"]) result = [self labelForKey: @"low"];
+	      else if ([s hasPrefix: @"5"]) result = [self labelForKey: @"lowest"];
+	    }
+	}
+    }
+  
+  return result;
+}
+
 - (NSString *) messageSubject
 {
  id baseSubject;
@@ -239,9 +289,8 @@

  if (!keys)
    keys = [[NSArray alloc] initWithObjects: @"UID",
-			    @"FLAGS", @"ENVELOPE", @"RFC822.SIZE",
-			    @"BODYSTRUCTURE", nil];
-
+    			    @"FLAGS", @"ENVELOPE", @"RFC822.SIZE",
+    			    @"BODYSTRUCTURE", @"BODY[HEADER.FIELDS (X-PRIORITY)]", nil];
  return keys;
 }

@@ -1,6 +1,6 @@
 /* UIxMailMainFrame.h - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailPopupView.m - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailSourceView.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailSourceView.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailUserRightsEditor.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxMailUserRightsEditor.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,5 +1,5 @@
 --
-- (C) 2007 Inverse groupe conseil
+-- (C) 2007 Inverse inc.
 --

 CREATE TABLE @{tableName} (
@@ -1,6 +1,6 @@
 --
 -- (C) 2004-2005 SKYRIX Software AG
-- (C) 2006-2007 Inverse groupe conseil
+-- (C) 2006-2007 Inverse inc.
 --

 CREATE TABLE @{tableName} (
@@ -1,5 +1,5 @@
 --
-- (C) 2007 Inverse groupe conseil
+-- (C) 2007 Inverse inc.
 --

 CREATE TABLE @{tableName} (
@@ -1,6 +1,6 @@
 --
 -- (C) 2004-2005 SKYRIX Software AG
-- (C) 2006-2007 Inverse groupe conseil
+-- (C) 2006-2007 Inverse inc.
 --

 CREATE TABLE @{tableName} (
@@ -1,6 +1,6 @@
 /* SOGoRootPage.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* SOGoUserHomePage.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* PreferencesUIProduct.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxAdditionalPreferences.h - this file is part of SOGo
 *
- * Copyright (C) 2008 Inverse groupe conseil
+ * Copyright (C) 2008 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxAdditionalPreferences.m - this file is part of SOGo
 *
- * Copyright (C) 2008 Inverse groupe conseil
+ * Copyright (C) 2008 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxJSONPreferences.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxJSONPreferences.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxPreferences.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxPreferences.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* SOGoElementsBuilder.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* SOGoElementsBuilder.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* SOGoElementsBundle.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* SOGoIEConditional.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* SOGoIEConditional.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* SOGoACLAdvisory.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* SOGoACLAdvisory.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* SOGoFolderAdvisory.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Ludovic Marcotte <ludovic@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* SOGoFolderAdvisory.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Ludovic Marcotte <ludovic@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxJSClose.h - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxJSClose.m - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* NSArray+Scheduler.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* NSArray+Scheduler.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* NSDictionary+Scheduler.h - this file is part of SOGo
 *
- * Copyright (C) 2008 Inverse groupe conseil
+ * Copyright (C) 2008 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* NSDictionary+Scheduler.m - this file is part of SOGo
 *
- * Copyright (C) 2008 Inverse groupe conseil
+ * Copyright (C) 2008 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxAppointmentEditor.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxAppointmentEditor.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxAttendeesEditor.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxAttendeesEditor.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalDateSelector.h - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalDateSelector.m - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalDayTable.h - this file is part of $PROJECT_NAME_HERE$
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalDayTable.m - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxContactsFilterPanel.h - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxContactsFilterPanel.m - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalListingActions.h - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalListingActions.m - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalMainView.h - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalMainView.m - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalMonthView.h - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalMonthView.m - this file is part of SOGo
 *
- * Copyright (C) 2006, 2007 Inverse groupe conseil
+ * Copyright (C) 2006, 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalMulticolumnDayView.h - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalMulticolumnDayView.h - this file is part of SOGo
 *
- * Copyright (C) 2006 Inverse groupe conseil
+ * Copyright (C) 2006 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalUserRightsEditor.h - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalUserRightsEditor.m - this file is part of SOGo
 *
- * Copyright (C) 2007 Inverse groupe conseil
+ * Copyright (C) 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
@@ -1,6 +1,6 @@
 /* UIxCalMainView.m - this file is part of SOGo
 *
- * Copyright (C) 2006, 2007 Inverse groupe conseil
+ * Copyright (C) 2006, 2007 Inverse inc.
 *
 * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
 *
--- a/Show More
+++ b/Show More