From ac999b973f297a42450141503c79b99c665e12a1 Mon Sep 17 00:00:00 2001 From: wolfgang Date: Mon, 31 Mar 2008 20:43:30 +0000 Subject: [PATCH] git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1397 d1b88da0-ebda-0310-925b-ed51d893ca5b --- ChangeLog | 5 +++++ Scripts/sogo-init.d-debian | 4 +++- UI/SOGoUI/SOGoACLAdvisory.m | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 472cfde0..a96d48cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-31 Wolfgang Sourdeau + + * UI/SOGoUI/SOGoACLAdvisory.m ([SOGoACLAdvisory -resourceName]): + use the resource display name instead of its "nameInContainer". + 2008-03-28 Wolfgang Sourdeau * SoObjects/Contacts/SOGoContactLDIFEntry.m ([SOGoContactLDIFEntry diff --git a/Scripts/sogo-init.d-debian b/Scripts/sogo-init.d-debian index 07e989aa..b7dfb81a 100755 --- a/Scripts/sogo-init.d-debian +++ b/Scripts/sogo-init.d-debian @@ -22,7 +22,9 @@ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -PREFORK=3 +# specify more if you are using a load-balancer +PREFORK=1 + SOGO_ARGS="" PATH=/sbin:/bin:/usr/sbin:/usr/bin diff --git a/UI/SOGoUI/SOGoACLAdvisory.m b/UI/SOGoUI/SOGoACLAdvisory.m index ecdbb5ff..621950ad 100644 --- a/UI/SOGoUI/SOGoACLAdvisory.m +++ b/UI/SOGoUI/SOGoACLAdvisory.m @@ -116,7 +116,7 @@ - (NSString *) resourceName { - return [aclObject nameInContainer]; + return [aclObject displayName]; } - (NSString *) subject -- 2.39.5