Bug 1285877 - Retain compatibility for iterator changes. r=MakeMyDay draft
authorPhilipp Kewisch <mozilla@kewis.ch>
Mon, 11 Jul 2016 10:58:25 +0200
changeset 19886 c46831f929dd5d3c7764e3ba21944fa1c2756906
parent 19885 e65ab8074a5b590a1617226e4bb7d6a7d957e311
push id58
push usermozilla@kewis.ch
push dateMon, 11 Jul 2016 08:59:26 +0000
reviewersMakeMyDay
bugs1285877
Bug 1285877 - Retain compatibility for iterator changes. r=MakeMyDay MozReview-Commit-ID: FBjDXUfhzKj
calendar/providers/gdata/modules/gdataUtils.jsm
--- a/calendar/providers/gdata/modules/gdataUtils.jsm
+++ b/calendar/providers/gdata/modules/gdataUtils.jsm
@@ -10,17 +10,16 @@ Components.utils.import("resource://gdat
 
 CuImport("resource://gre/modules/Services.jsm", this);
 CuImport("resource://gre/modules/Preferences.jsm", this);
 CuImport("resource://gre/modules/Promise.jsm", this);
 CuImport("resource://gre/modules/PromiseUtils.jsm", this);
 CuImport("resource://gre/modules/Task.jsm", this);
 
 CuImport("resource://calendar/modules/calUtils.jsm", this);
-CuImport("resource://calendar/modules/calIteratorUtils.jsm", this);
 CuImport("resource://calendar/modules/calProviderUtils.jsm", this);
 
 var cIE = Components.interfaces.calIErrors;
 
 var FOUR_WEEKS_IN_MINUTES = 40320;
 
 var EXPORTED_SYMBOLS = [
     "ItemToJSON", "JSONToItem", "ItemSaver",
@@ -581,17 +580,19 @@ function setupRecurrence(aItem, aRecurre
     try {
         let vevent = "BEGIN:VEVENT\r\n" + aRecurrence.join("\r\n") + "\r\nEND:VEVENT";
         rootComp = cal.getIcsService().parseICS(vevent, null);
     } catch (e) {
         cal.ERROR("[calGoogleCalendar] Unable to parse recurrence item: " + vevent);
     }
 
     let hasRecurringRules = false;
-    for (let prop of cal.ical.propertyIterator(rootComp)) {
+    for (let prop = rootComp.getFirstProperty("ANY");
+         prop;
+         prop = rootComp.getNextProperty("ANY")) {
        switch (prop.propertyName) {
             case "RDATE":
             case "EXDATE":
                 let recItem = Components.classes["@mozilla.org/calendar/recurrence-date;1"]
                               .createInstance(Components.interfaces.calIRecurrenceDate);
                 try {
                     recItem.icalProperty = prop;
                     aItem.recurrenceInfo.appendRecurrenceItem(recItem);