Backout changeset 6c9c976b382a - wrong patch committed
authorPhilipp Kewisch <mozilla@kewis.ch>
Sat, 27 Mar 2010 10:42:36 +0100
changeset 5290 5f5198980f402e707e946a15937ce94bc3994ac4
parent 5289 3b38a8becffed012a0aef92c075a4233b58867d4
child 5291 e6733e6bf8ad6d4bd4608eb158f1c1eec3545449
push idunknown
push userunknown
push dateunknown
backs out6c9c976b382ab8f5f2e3dba42e077a07fc9b13d3
Backout changeset 6c9c976b382a - wrong patch committed
calendar/base/modules/calProviderUtils.jsm
--- a/calendar/base/modules/calProviderUtils.jsm
+++ b/calendar/base/modules/calProviderUtils.jsm
@@ -149,67 +149,29 @@ cal.InterfaceRequestor_getInterface = fu
             this.calAuthPrompt = new cal.auth.Prompt();
         }
         return this.calAuthPrompt;
     } else if (aIID.equals(Components.interfaces.nsIAuthPromptProvider) ||
                aIID.equals(Components.interfaces.nsIPrompt)) {
         return Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
                          .getService(Components.interfaces.nsIWindowWatcher)
                          .getNewPrompter(null);
-    } else if (aIID.equals(Components.interfaces.nsIBadCertListener2)) {
-        return cal.BadCertHandler;
     }
 
     try {
         // Try to query the this object for the requested interface but don't
         // throw if it fails since that borks the network code.
         return this.QueryInterface(aIID);
     } catch (e) {
         Components.returnCode = e;
     }
     return null;
 };
 
 /**
- * Bad Certificate Handler for Network Requests. Shows the Network Exception
- * Dialog if a certificate Problem occurs.
- */
-cal.BadCertHandler = {
-    QueryInterface: function cBCL_QueryInterface(aIID) {
-        return cal.doQueryInterface(this, cal.BadCertListener.prototype, aIID,
-                                    [Components.interfaces.nsISupports,
-                                     Components.interfaces.nsIBadCertListener2]);
-    },
-
-    notifyCertProblem: function cBCL_notifyCertProblem(socketInfo, status, targetSite) {
-        if (!status) {
-            return true;
-        }
-
-        // Unfortunately we can't pass js objects using the window watcher, so
-        // we'll just take the first available calendar window. We also need to
-        // do this on a timeout so that the modal window doesn't block the
-        // network request.
-        let calWindow = cal.getCalendarWindow();
-
-        calWindow.setTimeout(function() {
-            let params = { exceptionAdded: false,
-                           prefetchCert: true,
-                           location: targetSite };
-            calWindow.openDialog("chrome://pippki/content/exceptionDialog.xul",
-                                 "",
-                                 "chrome,centerscreen,modal",
-                                 params);
-        }, 0);
-
-        return true;
-    }
-};
-
-/**
  * Freebusy interval implementation. All parameters are optional.
  *
  * @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.
  */