nsIPrefBranch2 has been merged with nsIPrefBranch since Fx 13

firebug · Oct 9, 2012 · 5c81f81 · 5c81f81
1 parent 728b007
commit 5c81f81
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 10 deletions.
diff --git a/extension/content/firebug/branch.properties b/extension/content/firebug/branch.properties
@@ -1,5 +1,5 @@
 # DO NOT MERGE INTO TRUNK
-RELEASE=.3
+RELEASE=.4
 VERSION=1.10
 TRUNK=
 # To allow build.xml to drop the xpi directly into the svn working copy for getfirebug.com

diff --git a/extension/content/firebug/chrome/panelActivation.js b/extension/content/firebug/chrome/panelActivation.js
@@ -18,7 +18,7 @@ function(Obj, Firebug, Firefox, Locale, Domplate, Url, Dom, FBS) {
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
-const prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch2);
+const prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
 
 
 /**

diff --git a/extension/content/firebug/cookies/cookieModule.js b/extension/content/firebug/cookies/cookieModule.js
@@ -64,7 +64,7 @@ const prompts = Xpcom.CCSV("@mozilla.org/embedcomp/prompt-service;1", "nsIPrompt
 // Preferences
 const PrefService = Cc["@mozilla.org/preferences-service;1"];
 const prefService = PrefService.getService(Ci.nsIPrefService);
-const prefs = PrefService.getService(Ci.nsIPrefBranch2);
+const prefs = PrefService.getService(Ci.nsIPrefBranch);
 
 // Cookie panel ID.
 const panelName = "cookies";

diff --git a/extension/content/firebug/js/tabCache.js b/extension/content/firebug/js/tabCache.js
@@ -27,7 +27,7 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-const prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch2);
+const prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
 const versionChecker = Cc["@mozilla.org/xpcom/version-comparator;1"].getService(Ci.nsIVersionComparator);
 const appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);
 

diff --git a/extension/content/firebug/lib/options.js b/extension/content/firebug/lib/options.js
@@ -13,12 +13,11 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 const nsIPrefBranch = Ci.nsIPrefBranch;
-const nsIPrefBranch2 = Ci.nsIPrefBranch2;
 const PrefService = Cc["@mozilla.org/preferences-service;1"];
 
 const nsIPrefService = Ci.nsIPrefService;
 const prefService = PrefService.getService(nsIPrefService);
-const prefs = PrefService.getService(nsIPrefBranch2);
+const prefs = PrefService.getService(nsIPrefBranch);
 
 const prefNames =  // XXXjjb TODO distribute to modules
 [

diff --git a/extension/content/firebug/main.js b/extension/content/firebug/main.js
@@ -24,7 +24,7 @@ if (FBTrace.DBG_INITIALIZE || FBTrace.DBG_MODULES)
 try
 {
     // xxxHonza: temporary hack for Crossfire to provide custom set of modules.
-    var prefService = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch2);
+    var prefService = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
     var value = prefService.getCharPref("extensions.firebug.defaultModuleList");
     if (value)
     {

diff --git a/extension/content/firebug/net/responseObserver.js b/extension/content/firebug/net/responseObserver.js
@@ -15,7 +15,7 @@ const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
-const PrefService = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch2);
+const PrefService = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
 var redirectionLimit = PrefService.getIntPref("network.http.redirection-limit");
 
 // ********************************************************************************************* //

diff --git a/extension/modules/firebug-service.js b/extension/modules/firebug-service.js
@@ -30,7 +30,6 @@ const jsdIErrorHook = Ci.jsdIErrorHook;
 const jsdIFilter = Components.interfaces.jsdIFilter;
 const nsISupports = Ci.nsISupports;
 const nsIPrefBranch = Ci.nsIPrefBranch;
-const nsIPrefBranch2 = Ci.nsIPrefBranch2;
 const nsIComponentRegistrar = Ci.nsIComponentRegistrar;
 const nsIFactory = Ci.nsIFactory;
 const nsIConsoleService = Ci.nsIConsoleService;
@@ -754,7 +753,7 @@ var fbs =
 
         this.profiling = false;
 
-        prefs = PrefService.getService(nsIPrefBranch2);
+        prefs = PrefService.getService(nsIPrefBranch);
         fbs.prefDomain = "extensions.firebug";
         prefs.addObserver(fbs.prefDomain, fbs, false);