disable isp config pending formal security review, r=philor, 422814
authorDavid Bienvenu <bienvenu@nventure.com>
Fri, 24 Apr 2009 15:22:16 -0700
changeset 2477 b11b7bed1b182ef5e265b50b7a190cb5128a655a
parent 2476 1a60aac99d5bb4d154711ffa3e29e01bbc2f0b71
child 2478 1a798b290ea19bd2082f11027ad819bd739b7c05
push idunknown
push userunknown
push dateunknown
reviewersphilor, 422814
bugs422814
disable isp config pending formal security review, r=philor, 422814
mailnews/base/prefs/resources/content/accountcreation/emailWizard.js
--- a/mailnews/base/prefs/resources/content/accountcreation/emailWizard.js
+++ b/mailnews/base/prefs/resources/content/accountcreation/emailWizard.js
@@ -363,68 +363,54 @@ EmailConfigWizard.prototype =
     this.startSpinner("searching_for_configs");
     this.setSpinnerStatus("check_preconfig");
     if (this._probeAbortable)
     {
       gEmailWizardLogger.info("aborting existing config search");
       this._probeAbortable.cancel();
     }
     var me = this;
-    this._probeAbortable = fetchConfigFromDisk(domain,
-    function(config) // success
-    {
-      me.foundConfig(config);
-      me.stopSpinner("finished_with_success");
-      me.setSpinnerStatus("found_preconfig");
-      me._probeAbortable = null;
-    },
-    function(e) // fetchConfigFromDisk failed
-    {
-      gEmailWizardLogger.info("fetchConfigFromDisk failed: " + e);
-      me.startSpinner("searching_for_configs");
-      me.setSpinnerStatus("checking_config");
-      me._probeAbortable = fetchConfigFromISP(domain, email,
-      function(config) // success
-      {
-        me.foundConfig(config);
-        if ((me._incomingState != 'failed') && (me._outgoingState != 'failed'))
-        {
-          me.stopSpinner("finished_with_success");
-          me.setSpinnerStatus("found_config");
-          me.showEditButton();
-        }
-        me._probeAbortable = null;
-      },
-      function(e) // fetchConfigFromISP failed
-      {
-        gEmailWizardLogger.info("fetchConfigFromISP failed: " + e);
-        me.startSpinner("searching_for_configs");
-        me.setSpinnerStatus("checking_mozilla_config");
-        me._probeAbortable = fetchConfigFromDB(domain,
+    this._probeAbortable = 
+      fetchConfigFromDisk(
+        domain,
         function(config) // success
         {
           me.foundConfig(config);
           me.stopSpinner("finished_with_success");
-          me.setSpinnerStatus("found_isp_config");
-          me.showEditButton();
+          me.setSpinnerStatus("found_preconfig");
           me._probeAbortable = null;
         },
-        function(e) // fetchConfigFromDB failed
+        function(e) // fetchConfigFromDisk failed
         {
-          ddump("fetchConfigFromDB failed: " + e);
-          gEmailWizardLogger.info("fetchConfigFromDB failed: " + e);
-          me.setSpinnerStatus("probing_config");
-          var initialConfig = new AccountConfig();
-          me._prefillConfig(initialConfig);
-          me.startSpinner("searching_for_configs")
-          me.setSpinnerStatus("guessing_from_email");
-          me._guessConfig(domain, initialConfig, 'both');
-        });
-      });
-    });
+          gEmailWizardLogger.info("fetchConfigFromDisk failed: " + e);
+          me.startSpinner("searching_for_configs");
+          me.setSpinnerStatus("checking_mozilla_config");
+          me._probeAbortable = 
+            fetchConfigFromDB(
+              domain,
+              function(config) // success
+              {
+                me.foundConfig(config);
+                me.stopSpinner("finished_with_success");
+                me.setSpinnerStatus("found_isp_config");
+                me.showEditButton();
+                me._probeAbortable = null;
+              },
+              function(e) // fetchConfigFromDB failed
+              {
+                ddump("fetchConfigFromDB failed: " + e);
+                gEmailWizardLogger.info("fetchConfigFromDB failed: " + e);
+                me.setSpinnerStatus("probing_config");
+                var initialConfig = new AccountConfig();
+                me._prefillConfig(initialConfig);
+                me.startSpinner("searching_for_configs")
+                me.setSpinnerStatus("guessing_from_email");
+                me._guessConfig(domain, initialConfig, 'both');
+              });
+          });
   },
 
   _guessConfig : function(domain, initialConfig, which)
   {
     let me = this;
     //ddumpObject(initialConfig, "initial config", 3);
     // guessConfig takes several callback functions, which we define inline.
     me._probeAbortable = guessConfig(domain,