Integrated URL Fixer into Adblock Plus

lib/main.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
 /**
  * @fileOverview Starts up Adblock Plus
  */
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-let {Prefs} = require("prefs");
 let {TimeLine} = require("timeline");
 
 TimeLine.enter("Adblock Plus startup");
+let {Prefs} = require("prefs");
+TimeLine.log("Done loading preferences");
 registerPublicAPI();
 TimeLine.log("Done registering public API");
 require("filterListener");
 TimeLine.log("Done loading filter listener");
 require("contentPolicy");
 TimeLine.log("Done loading content policy");
 require("synchronizer");
 TimeLine.log("Done loading subscription synchronizer");
 require("sync");
 TimeLine.log("Done loading sync support");
 require("ui");
 TimeLine.log("Done loading UI integration code");
 if (!Prefs.correctTyposAsked || (Prefs.correctTyposAsked && Prefs.correctTypos))
 {
-  // Do not ask to opt-in if user found setting
-  if (!Prefs.correctTyposAsked)
-  {
-    let onPrefChange = function(name)
-    {
-      if (name == "correctTypos")
-      {
-        Prefs.correctTyposAsked = true;
-        Prefs.removeListener(onPrefChange);
-      }
-    }
-    
-    Prefs.addListener(onPrefChange);
-  }

[Wladimir Palant, 2012/11/09 14:44:31]

I'm not really happy with advanced logic being moved to main.js. How about
having this code in typoAppIntegration.js, you deal with these flags there
already.

-  
   require("typoFixer");
   TimeLine.log("Done loading typo correction");
 }
 else
 {
   let onPrefChange = function(name)
   {
     if (name == "correctTypos")
     {
       require("typoFixer");
@@ skipping 28 matching lines @@
 
   let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
   registrar.registerFactory(classID, "Adblock Plus public API URL", contractID, factory);
 
   onShutdown.add(function()
   {
     registrar.unregisterFactory(classID, factory);
     Cu.unload(uri.spec);
   });
 }