Fix bug 668153 - wcap not working since TB5 and Lightning 1.0b4rc2. r=mschroeder
authorMatthew Mecca <matthew.mecca@gmail.com>
Tue, 05 Jul 2011 16:21:00 +0300
changeset 8069 8961a80e383c2b133bb6e6f3c9f4bf6f127cec8e
parent 8068 a6bdbe78f1f75d4199f303e13af6cbb0bc9f1034
child 8070 65a97840d9258e90772d76e1f0e55c5712fe2677
push id6208
push usermozilla@kewis.ch
push dateFri, 08 Jul 2011 07:38:49 +0000
treeherdercomm-central@7dab38a4d5ce [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmschroeder
bugs668153
Fix bug 668153 - wcap not working since TB5 and Lightning 1.0b4rc2. r=mschroeder
calendar/providers/wcap/calWcapCalendarItems.js
--- a/calendar/providers/wcap/calWcapCalendarItems.js
+++ b/calendar/providers/wcap/calWcapCalendarItems.js
@@ -968,18 +968,16 @@ calWcapCalendar.prototype.parseItems = f
                     log("item: " + item.title + "\n" + item.icalString, this);
                 }
                 if (!bLeaveMutable) {
                     item.makeImmutable();
                 }
                 items.push(item);
             }
         }
-
-        cal.processPendingEvent();
     }
 
     // tag "exceptions", i.e. items with rid:
     for each (let item in excItems) {
         let parent = uid2parent[item.id];
 
         if (!parent) { // a parentless one, fake a master and override it's occurrence
             parent = isEvent(item) ? createEvent() : createTodo();
@@ -1004,18 +1002,16 @@ calWcapCalendar.prototype.parseItems = f
             // cs ought to return proper all-day RECURRENCE-ID!
             // get into startDate's timezone before cutting:
             let rid = item.recurrenceId.getInTimezone(recStartDate.timezone);
             rid.isDate = true;
             item.recurrenceId = rid;
         }
 
         parent.recurrenceInfo.modifyException(item, true);
-
-        cal.processPendingEvent();
     }
 
     if (itemFilter & calICalendar.ITEM_FILTER_CLASS_OCCURRENCES) {
         for each (let item in unexpandedItems) {
             if (maxResults != 0 && items.length >= maxResults) {
                 break;
             }
 
@@ -1052,18 +1048,16 @@ calWcapCalendar.prototype.parseItems = f
                     log("master item: " + item.title + "\n" + item.icalString, this);
                     for each (let occ in occurrences) {
                         log("item: " + occ.title + "\n" + occ.icalString, this);
                     }
                 }
             }
             // only proxies returned:
             items = items.concat(occurrences);
-
-            cal.processPendingEvent();
         }
 
     } else {
         if (maxResults != 0 &&
             (items.length + unexpandedItems.length) > maxResults) {
             unexpandedItems.length = (maxResults - items.length);
         }
         if (!bLeaveMutable) {