See ChangeLog

Monotone-Parent: 535292a4d5c9f53624dcaabc419821b5755e9ccc
Monotone-Revision: c35e5e0bbfa47c91a6b8c9b68bf31ca78ee421fc

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-12-14T18:08:36
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoUser.h

@@ -1,15 +1,15 @@
 /*
-  Copyright (C) 2006-2009 Inverse inc.
+  Copyright (C) 2006-2010 Inverse inc.
   Copyright (C) 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.
@@ -29,7 +29,7 @@
   SOGoUser
 
   This adds some additional SOGo properties to the SoUser object. The
-  properties are (currently) looked up using the LDAPUserManager.
+  properties are (currently) looked up using the SOGoUserManager.
 
   You have access to this object from the WOContext:
     context.activeUser
@@ -52,12 +52,6 @@
 @class SOGoUserProfile;
 @class SOGoUserSettings;
 
-// @interface SoUser (SOGoExtension)
-
-// - (NSString *) language;
-
-// @end
-
 @interface SOGoUser : SoUser
 {
   SOGoUserDefaults *_defaults;
@@ -72,8 +66,6 @@
   NSString *cn;
 }
 
-// + (NSString *) language;
-
 + (SOGoUser *) userWithLogin: (NSString *) newLogin;
 
 + (SOGoUser *) userWithLogin: (NSString *) login