From 4d5c8b8ca25982d6b53d39b3724cde3a09a6054a Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 3 May 2007 18:39:03 +0000 Subject: [PATCH] Monotone-Parent: 0cbd4a9c5bf491a238af8827cc1200efcd8577d6 Monotone-Revision: ea749e8a379c178fc2744bc5cee6af5d1d20640d Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-05-03T18:39:03 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/SOGo/SOGoUser.m | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 168248ebb..6fd8773bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-05-03 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoUser.m ([SOGoUser -systemEmail]): new method + forwared to [AgenorUserManager getSystemEmailForUID:]. + * UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor -toolbar]): method replacing the one with the same name in the task and appointment editor classes. This method makes also use of diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index e6c5a498e..736b238f7 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/SoObjects/SOGo/SOGoUser.m @@ -102,7 +102,7 @@ static NSTimeZone *serverTimeZone = nil; - (NSString *) email { - if (email == nil) + if (!email) { email = [[self userManager] getEmailForUID: [self login]]; [email retain]; @@ -111,6 +111,17 @@ static NSTimeZone *serverTimeZone = nil; return email; } +- (NSString *) systemEmail +{ + if (!systemEmail) + { + systemEmail = [[self userManager] getSystemEmailForUID: [self login]]; + [systemEmail retain]; + } + + return systemEmail; +} + - (NSString *) cn { if (cn == nil)