See ChangeLog.

Monotone-Parent: ef272f61d0caedee9632010cd4b3ce928a2da43e
Monotone-Revision: 6ed6359462b26ed18e75361bf078fb93cda23519

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-13T17:20:58

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007-2011 Inverse inc.
+  Copyright (C) 2007-2012 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
   This file is part of SOGo.
@@ -1820,7 +1820,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 						 to: (NSCalendarDate *) to
 {
   SOGoUser *user;
-  NSString *login, *calendarData;
+  NSString *login, *contactId, *calendarData;
   SOGoFreeBusyObject *freebusy;
 
   login = [recipient uid];
@@ -1833,8 +1833,21 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
       calendarData = [freebusy contentAsStringWithMethod: @"REPLY"
                                                   andUID: uid
                                             andOrganizer: organizer
+                                              andContact: nil
                                                     from: start to: to];
     }
+  else if ((contactId = [recipient contactIDInContext: context]))
+    {
+      user = [context activeUser];
+      freebusy = [[user homeFolderInContext: context]
+		       freeBusyObject: @"freebusy.ifb"
+                            inContext: context];
+      calendarData = [freebusy contentAsStringWithMethod: @"REPLY"
+                                                  andUID: uid
+                                            andOrganizer: organizer
+                                              andContact: contactId
+                                                    from: start to: to];      
+    }
   else
     {
       user = nil;
@@ -1947,8 +1960,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
     tags = [self caldavFreeBusyRequest: (iCalFreeBusy *) element];
   else if ([tag isEqualToString: @"VEVENT"])
     tags = [self caldavEventRequest: (iCalEvent *) element
-		 withContent: iCalString
-		 from: originator to: recipients];
+                        withContent: iCalString
+                               from: originator to: recipients];
   else
     tags = nil;