From 18cef1e7c2ce23f5f9168fa2f70c5930c45b5578 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 7 Mar 2007 22:31:02 +0000 Subject: [PATCH] Monotone-Parent: 54dc6ee0dac49ddab76097b4e22cd6d4d5d91a3d Monotone-Revision: e6ad80e24c1ede734b861d9072dacbb1338a2067 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-03-07T22:31:02 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/SOGo/SOGoAuthenticator.h | 4 ++++ SoObjects/SOGo/SOGoAuthenticator.m | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42bc66729..331f0414f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-03-07 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoAuthenticator.m ([SOGoAuthenticator + -userInContext:]): returns "SOGoUser". + * SoObjects/Appointments/SOGoCalendarComponent.m ([SOGoCalendarComponent -contentAsString]): overriden method that takes the privacy into account and discard the relevant fields if diff --git a/SoObjects/SOGo/SOGoAuthenticator.h b/SoObjects/SOGo/SOGoAuthenticator.h index 1a5549e53..a56ac4267 100644 --- a/SoObjects/SOGo/SOGoAuthenticator.h +++ b/SoObjects/SOGo/SOGoAuthenticator.h @@ -34,6 +34,8 @@ @class NSUserDefaults; @class NSString; +@class SOGoUser; + @interface SOGoAuthenticator : SoHTTPAuthenticator { NSUserDefaults *ud; @@ -47,6 +49,8 @@ - (BOOL) LDAPCheckLogin: (NSString *) _login password: (NSString *) _pwd; +- (SOGoUser *) userInContext: (WOContext *) _ctx; + @end #endif /* __Main_SOGoAuthenticator_H__ */ diff --git a/SoObjects/SOGo/SOGoAuthenticator.m b/SoObjects/SOGo/SOGoAuthenticator.m index 18c00d272..2c276e06b 100644 --- a/SoObjects/SOGo/SOGoAuthenticator.m +++ b/SoObjects/SOGo/SOGoAuthenticator.m @@ -96,9 +96,9 @@ static SOGoAuthenticator *auth = nil; /* create SOGoUser */ -- (SoUser *) userInContext:(WOContext *)_ctx +- (SOGoUser *) userInContext: (WOContext *)_ctx { - static SoUser *anonymous = nil, *freebusy; + static SOGoUser *anonymous = nil, *freebusy; SoUser *user; NSArray *traversalPath; NSString *login;