From 7fa79e7b4daaa6c5266acbe5e146113ba5845420 Mon Sep 17 00:00:00 2001 From: mguessan Date: Mon, 14 May 2012 20:50:21 +0000 Subject: [PATCH] Caldav: reintroduce davmail.caldavDisableTasks setting to disable tasks support git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1959 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- src/java/davmail/exchange/ExchangeSession.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java index 46bfcbfb..5a79db72 100644 --- a/src/java/davmail/exchange/ExchangeSession.java +++ b/src/java/davmail/exchange/ExchangeSession.java @@ -2571,7 +2571,7 @@ public abstract class ExchangeSession { public List getAllEvents(String folderPath) throws IOException { List results = searchEvents(folderPath, getCalendarItemCondition(getPastDelayCondition("dtstart"))); - if (isMainCalendar(folderPath)) { + if (!Settings.getBooleanProperty("davmail.caldavDisableTasks", false) && isMainCalendar(folderPath)) { // retrieve tasks from main tasks folder results.addAll(searchTasksOnly(TASKS)); }