See ChangeLog.

Monotone-Parent: b3af4618e267496536ae158c684a391e497913f0
Monotone-Revision: 85f004835cf5ba09158bc317c859435dd12fe5bf

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-03-30T15:21:27
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -13,6 +13,12 @@
 	(-fetchFreeBusyInfosFrom:to:): we must fetch the c_content in
 	order to flatten cyclic events.
 
+	* SoObjects/SOGo/SOGoSystemDefaults.m (-pageTitle): new method to
+	retrieve the Web page title from the new system defaults "SOGoPageTitle".
+
+	* UI/Common/UIxPageFrame.m (-title): consider the new system
+	default attribute "SOGoPageTitle".
+
 2011-03-29  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/Appointments/iCalEvent+SOGo.m

SoObjects/SOGo/SOGoSystemDefaults.h

@@ -58,6 +58,7 @@
 - (BOOL) uixAdditionalPreferences;
 
 - (BOOL) uixDebugEnabled;
+- (NSString *) pageTitle;
 
 - (NSArray *) supportedLanguages;
 - (NSString *) loginSuffix;

SoObjects/SOGo/SOGoSystemDefaults.m

@@ -271,6 +271,11 @@ BootstrapNSUserDefaults ()
   return [self boolForKey: @"SOGoUIxDebugEnabled"];
 }
 
+- (NSString *) pageTitle
+{
+  return [self stringForKey: @"SOGoPageTitle"];
+}
+
 - (NSArray *) supportedLanguages
 {
   return [self stringArrayForKey: @"SOGoSupportedLanguages"];

UI/Common/UIxPageFrame.m

@@ -78,10 +78,20 @@
 
 - (NSString *) title
 {
-  if ([self isUIxDebugEnabled])
-    return title;
+  NSString *pageTitle;
+  SOGoSystemDefaults *sd;
 
-  return [self labelForKey: @"SOGo"];
+  if ([self isUIxDebugEnabled])
+    pageTitle = title;
+  else
+    {
+      sd = [SOGoSystemDefaults sharedSystemDefaults];
+      pageTitle = [sd pageTitle];
+      if (pageTitle == nil || ![pageTitle length])
+	pageTitle = [self labelForKey: @"SOGo"];
+    }
+
+  return pageTitle;
 }
 
 - (void) setItem: (id) _item