Monotone-Parent: b3104cb2f524576b6a02514df135076db60274ea

Monotone-Revision: 1471bacc37d4bfc7718c85c0760024d89c4440ef

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-09T19:23:45
Monotone-Branch: ca.inverse.sogo

UI/MailPartViewers/UIxMailPartICalViewer.m

@@ -26,7 +26,7 @@
 */
 
 #import <SOGoUI/SOGoDateFormatter.h>
-#import <SOGo/SOGoUser.h>
+#import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #import <SoObjects/Appointments/SOGoAppointmentObject.h>
 #import <SoObjects/Mailer/SOGoMailObject.h>
@@ -189,8 +189,15 @@
 
 - (id)calendarFolder {
   /* return scheduling calendar of currently logged-in user */
-  return [[[self context] activeUser] schedulingCalendarInContext:
-					[self context]];
+  SOGoUser *user;
+  id folder;
+
+  user = [context activeUser];
+  folder = [[user homeFolderInContext: context] lookupName: @"Calendar"
+						inContext: context
+						acquire: NO];
+
+  return folder;
 }
 
 - (id)storedEventObject {
@@ -238,7 +245,7 @@
 /* organizer tracking */
 
 - (NSString *)loggedInUserEMail {
-  return [[[self context] activeUser] email];
+  return [[[self context] activeUser] primaryEmail];
 }
 
 - (iCalEvent *)authorativeEvent {