Bug 1476733 - Add missing conversions to ChromeUtils.generateQI in calProviderUtils. r=philipp
authorMakeMyDay <makemyday@gmx-topmail.de>
Sun, 22 Jul 2018 22:48:10 +0200
changeset 32689 e9b4a9b6c5ce87ac5e4956a2843f9b43a3cdc44c
parent 32688 dfe9012aafc42bb72af743fa0950fd0f5281626e
child 32690 fe8684d0f25a39d5c63a87f1af8c465750641d74
push id386
push userclokep@gmail.com
push dateTue, 23 Oct 2018 00:48:12 +0000
reviewersphilipp
bugs1476733
Bug 1476733 - Add missing conversions to ChromeUtils.generateQI in calProviderUtils. r=philipp
calendar/base/modules/utils/calProviderUtils.jsm
--- a/calendar/base/modules/utils/calProviderUtils.jsm
+++ b/calendar/base/modules/utils/calProviderUtils.jsm
@@ -163,18 +163,18 @@ var calprovider = {
         return null;
     },
 
     /**
      * Bad Certificate Handler for Network Requests. Shows the Network Exception
      * Dialog if a certificate Problem occurs.
      */
     BadCertHandler: class {
-        QueryInterface(iid) {
-            return cal.generateClassQI(this, iid, [Components.interfaces.nsIBadCertListener2]);
+        QueryInterface() {
+            return ChromeUtils.generateQI([Ci.nsIBadCertListener2]);
         }
 
         constructor(thisProvider) {
             this.thisProvider = thisProvider;
             this.timer = null;
         }
 
         notifyCertProblem(socketInfo, status, targetSite) {
@@ -221,18 +221,18 @@ var calprovider = {
      *
      * @param aCalId         The calendar id to set up with.
      * @param aFreeBusyType  The type from calIFreeBusyInterval.
      * @param aStart         The start of the interval.
      * @param aEnd           The end of the interval.
      * @return               The fresh calIFreeBusyInterval.
      */
     FreeBusyInterval: class {
-        QueryInterface(iid) {
-            return cal.generateClassQI(this, iid, [Components.interfaces.calIFreeBusyInterval]);
+        QueryInterface() {
+            return ChromeUtils.generateQI([Ci.calIFreeBusyInterval]);
         }
 
         constructor(aCalId, aFreeBusyType, aStart, aEnd) {
             this.calId = aCalId;
             this.interval = Components.classes["@mozilla.org/calendar/period;1"]
                                       .createInstance(Components.interfaces.calIPeriod);
             this.interval.start = aStart;
             this.interval.end = aEnd;