From eef4ce6a2cc0f1094cc436c196e62a35c42ba55f Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 18 Apr 2012 16:56:13 +0000
Subject: [PATCH] Monotone-Parent: 825d6255230167e6f80d8015a569afa6bdb4cb7d
 Monotone-Revision: 8ca87c84e17cb0c60871b46aee9b11dc7900f1c2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-18T16:56:13
---
 ChangeLog                                      | 6 ++++++
 SoObjects/Appointments/SOGoAppointmentFolder.m | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab83cbd4b..c9d1e243c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	(-importCalendar:): journals and freebusys are not
+	supported.
+
 2012-04-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/NSString+Utilities.m (-encryptWithKey:)
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 31cf4a442..146b38f89 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -2746,8 +2746,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
       components = [[calendar events] mutableCopy];
       [components autorelease];
       [components addObjectsFromArray: [calendar todos]];
-      [components addObjectsFromArray: [calendar journals]];
-      [components addObjectsFromArray: [calendar freeBusys]];
+      // [components addObjectsFromArray: [calendar journals]];
+      // [components addObjectsFromArray: [calendar freeBusys]];
       count = [components count];
       for (i = 0; i < count; i++)
         {