diff --git a/ChangeLog b/ChangeLog index a6e4c4621..e2810bb0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-06-08 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoAppointmentFolderObject.m + (-displayName, -davDisplayName): new accessors that are forwarded + to the real folder object. + * UI/WebServerResources/UIxAclEditor.js: (onAclLoadHandler) we bind the "unload" event rather than "beforeunload", which does not seem to work on IE. diff --git a/SoObjects/Appointments/SOGoAppointmentFolderObject.h b/SoObjects/Appointments/SOGoAppointmentFolderObject.h index c69d6a444..c8c1e9175 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolderObject.h +++ b/SoObjects/Appointments/SOGoAppointmentFolderObject.h @@ -34,6 +34,8 @@ - (iCalCalendar *) contentCalendar; +- (NSString *) displayName; + @end #endif /* SOGOAPPOINTMENTFOLDEROBJECT_H */ diff --git a/SoObjects/Appointments/SOGoAppointmentFolderObject.m b/SoObjects/Appointments/SOGoAppointmentFolderObject.m index 223115ccf..95077945f 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolderObject.m +++ b/SoObjects/Appointments/SOGoAppointmentFolderObject.m @@ -182,4 +182,14 @@ return nil; } +- (NSString *) displayName +{ + return [[self _folder] displayName]; +} + +- (NSString *) davDisplayName +{ + return [self displayName]; +} + @end