Monotone-Parent: 3bc573b09449f0efea891e5e11a232520f51205c

Monotone-Revision: 3188fd0271db42fb785221461e9a3655109f23a8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-20T19:15:26
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoFolder.m

@@ -224,6 +224,14 @@
 
 /* folder type */
 
+- (BOOL) isEqual: (id) otherFolder
+{
+  return ([otherFolder class] == [self class]
+	  && [container isEqual: [otherFolder container]]
+	  && [nameInContainer
+	       isEqualToString: [otherFolder nameInContainer]]);
+}
+
 - (NSString *) outlookFolderClass
 {
   [self subclassResponsibility: _cmd];

SoObjects/SOGo/SOGoGCSFolder.m

@@ -48,6 +48,7 @@
 #import "NSString+Utilities.h"
 
 #import "SOGoContentObject.h"
+#import "SOGoParentFolder.h"
 #import "SOGoPermissions.h"
 #import "SOGoUser.h"
 
@@ -109,11 +110,16 @@ static NSString *defaultUserID = @"<default>";
 
 - (void) _setDisplayNameFromRow: (NSDictionary *) row
 {
-  NSString *currentLogin, *ownerLogin;
+  NSString *currentLogin, *ownerLogin, *primaryDN;
   NSDictionary *ownerIdentity;
 
-  displayName
-    = [NSMutableString stringWithString: [row objectForKey: @"c_foldername"]];
+  primaryDN = [row objectForKey: @"c_foldername"];
+  displayName = [NSMutableString string];
+  if ([primaryDN isEqualToString: [container defaultFolderName]])
+    [displayName appendString: [self labelForKey: primaryDN]];
+  else
+    [displayName appendString: primaryDN];
+
   currentLogin = [[context activeUser] login];
   ownerLogin = [self ownerInContext: context];
   if (![currentLogin isEqualToString: ownerLogin])

SoObjects/SOGo/SOGoObject.m

@@ -995,11 +995,13 @@ static BOOL kontactGroupDAV = YES;
 
   userLanguage = [[context activeUser] language];
   paths = [bundle pathsForResourcesOfType: @"strings"
-		  inDirectory: [NSString stringWithFormat: @"%@.lproj", userLanguage]
+		  inDirectory: [NSString stringWithFormat: @"%@.lproj",
+					 userLanguage]
 		  forLocalization: userLanguage];
   if ([paths count] > 0)
     {
-      strings = [NSDictionary dictionaryFromStringsFile: [paths objectAtIndex: 0]];
+      strings = [NSDictionary
+		  dictionaryFromStringsFile: [paths objectAtIndex: 0]];
       label = [strings objectForKey: key];
       if (!label)
 	label = key;

UI/Scheduler/UIxComponentEditor.m

@@ -478,6 +478,21 @@
   return calendarList;
 }
 
+- (NSString *) calendarDisplayName
+{
+  NSString *fDisplayName;
+  SOGoAppointmentFolder *folder;
+  SOGoAppointmentFolders *parentFolder;
+
+  fDisplayName = [item displayName];
+  folder = [[self clientObject] container];
+  parentFolder = [folder container];
+  if ([fDisplayName isEqualToString: [parentFolder defaultFolderName]])
+    fDisplayName = [self labelForKey: fDisplayName];
+
+  return fDisplayName;
+}
+
 - (NSString *) calendarsFoldersList
 {
   NSArray *calendars;

UI/Templates/SchedulerUI/UIxComponentEditor.wox

@@ -47,7 +47,7 @@
             /><var:string label:value="Calendar:" />
           <var:popup const:id="calendarList"
 	    list="calendarList" item="item"
-            string="item.displayName"
+            string="calendarDisplayName"
 	    selection="componentCalendar"
 	    /></span></span>
       <span class="checkBoxList"><var:string label:value="Priority:" />