From 0b245dedf510cc53f554a7b8a6143fea4e3575df Mon Sep 17 00:00:00 2001
From: "dmose%mozilla.org"
 <dmose%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 14 Dec 2004 00:49:54 +0000
Subject: [PATCH] Fix recurrence issues; patch from vlad.  Not part of the
 build.

git-svn-id: svn://10.0.0.236/trunk@166674 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/calendar/providers/caldav/calDavCalendar.js    | 6 +++---
 mozilla/calendar/providers/memory/calMemoryCalendar.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mozilla/calendar/providers/caldav/calDavCalendar.js b/mozilla/calendar/providers/caldav/calDavCalendar.js
index af78088ea2e..a3c083ee6c2 100644
--- a/mozilla/calendar/providers/caldav/calDavCalendar.js
+++ b/mozilla/calendar/providers/caldav/calDavCalendar.js
@@ -75,8 +75,8 @@ function makeOccurrence(item, start, end)
         createInstance(calIItemOccurrence);
     // XXX poor form
     occ.wrappedJSObject.item = item;
-    occ.wrappedJSObject.occurrenceStartDate = item.startDate;
-    occ.wrappedJSObject.occurrenceEndDate = item.endDate;
+    occ.wrappedJSObject.occurrenceStartDate = start;
+    occ.wrappedJSObject.occurrenceEndDate = end;
     return occ;
 }
   
@@ -472,7 +472,7 @@ calDavCalendar.prototype = {
                         } else if (itemEndTime >= startTime) {
                         // no occurrences
                         if (itemReturnOccurrences)
-                            itemtoadd = makeOccurrence(item, itemStartDate, itemEndDate);
+                            itemtoadd = makeOccurrence(item, item.startDate, item.endDate);
                         else
                             itemtoadd = item;
                         itemsFound.push(itemtoadd);
diff --git a/mozilla/calendar/providers/memory/calMemoryCalendar.js b/mozilla/calendar/providers/memory/calMemoryCalendar.js
index 100b125ddbd..821b6c8f4fb 100644
--- a/mozilla/calendar/providers/memory/calMemoryCalendar.js
+++ b/mozilla/calendar/providers/memory/calMemoryCalendar.js
@@ -52,8 +52,8 @@ function makeOccurrence(item, start, end)
         createInstance(calIItemOccurrence);
     // XXX poor form
     occ.wrappedJSObject.item = item;
-    occ.wrappedJSObject.occurrenceStartDate = item.startDate;
-    occ.wrappedJSObject.occurrenceEndDate = item.endDate;
+    occ.wrappedJSObject.occurrenceStartDate = item.start;
+    occ.wrappedJSObject.occurrenceEndDate = item.end;
     return occ;
 }
 
@@ -368,7 +368,7 @@ calMemoryCalendar.prototype = {
                 } else if (itemEndTime >= startTime) {
                     // no occurrences
                     if (itemReturnOccurrences)
-                        itemtoadd = makeOccurrence(item, itemStartDate, itemEndDate);
+                        itemtoadd = makeOccurrence(item, item.startDate, item.endDate);
                     else
                         itemtoadd = item;
                     itemsFound.push(itemtoadd);