From 25b7fffb009333e07de5f0327288086de08cd942 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 1 Oct 2014 14:08:29 -0400
Subject: [PATCH] Fix for bug #2930

---
 NEWS                         | 6 ++++++
 UI/MainUI/SOGoUserHomePage.m | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index e2d50e2a8..2c794faca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2.2.10 (2014-xx-xx)
+-------------------
+
+Bug fixes
+ - fix freebusy lookup with "Show time as busy" (#2930)
+
 2.2.9a (2014-09-29)
 -------------------
 
diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m
index 39d96ec26..f3a517549 100644
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@@ -215,7 +215,10 @@
                             timeZone: [endDate timeZone]];
 
   interval = [endDate timeIntervalSinceDate: startDate] + 60;
-  intervals = interval / intervalSeconds; /* slices of 15 minutes */
+
+  // Slices of 15 minutes. The +4 is to take into account that we can
+  // have a timezone change during the freebusy lookup.
+  intervals = interval / intervalSeconds + 4;
 
   // Build a bit string representation of the freebusy data for the period
   freeBusyItems = NSZoneCalloc (NULL, intervals, sizeof (int));