git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1397 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index 472cfde0f12c95e1b26293de0d15339bb8c214b1..a96d48cbdb62ab2e8e53c203044474fc3dd044e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * UI/SOGoUI/SOGoACLAdvisory.m ([SOGoACLAdvisory -resourceName]):
+       use the resource display name instead of its "nameInContainer".
+
 2008-03-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
        * SoObjects/Contacts/SOGoContactLDIFEntry.m ([SOGoContactLDIFEntry

diff --git a/Scripts/sogo-init.d-debian b/Scripts/sogo-init.d-debian
index 07e989aac62d92c38822e3386954ba057908e015..b7dfb81a5877ade3ad16c9a4134d6d58999de767 100755 (executable)
--- 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 ecdbb5ffae7bd713af3de982c296a1ab5b1540f5..621950ada9f86e3cc3e8d16a6f9deb44935da1f6 100644 (file)
--- a/UI/SOGoUI/SOGoACLAdvisory.m
+++ b/UI/SOGoUI/SOGoACLAdvisory.m
@@ -116,7 +116,7 @@
 
 - (NSString *) resourceName
 {
-  return [aclObject nameInContainer];
+  return [aclObject displayName];
 }
 
 - (NSString *) subject