Bug 1388275 - Port
Bug 1374847. Rename nsIPrefBranch2 to nsIPrefBranch. r=IanN
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,17 +6,17 @@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DOMi_VERSION = 2.0.17.0
+DOMi_VERSION = 2.0.17.1
XPI_NAME = inspector
INSTALL_EXTENSION_ID = inspector@mozilla.org
XPI_PKGNAME = inspector-$(DOMi_VERSION)
DIST_FILES = install.rdf
DEFINES += -DDOMi_VERSION=$(DOMi_VERSION)
--- a/install.rdf
+++ b/install.rdf
@@ -5,67 +5,68 @@
#filter substitution
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>inspector@mozilla.org</em:id>
<em:version>@DOMi_VERSION@</em:version>
+ <em:multiprocessCompatible>false</em:multiprocessCompatible>
<!-- DOM Inspector supports Gecko 2.0.0 and higher.
All applications listed below are the subset of supported versions
which also use an appropriate version of Gecko. -->
<!-- For maxVersion of applications that follow the rapid cycle pattern,
use '(x)a1' (*-central) on default,
and '(x-1).*' (*-aurora/beta/release) for branches. -->
<!-- Fennec -->
<em:targetApplication>
<Description>
<em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
<em:minVersion>4.0</em:minVersion>
- <em:maxVersion>53.0</em:maxVersion>
+ <em:maxVersion>56.0</em:maxVersion>
</Description>
</em:targetApplication>
<!-- Firefox
3.0 is Gecko 1.9.0
3.5 is Gecko 1.9.1
3.6 is Gecko 1.9.2
4.0 is Gecko 2.0
5.0 is Gecko 5.0
x.0 is Gecko x.0, where x is greater than 5 -->
<em:targetApplication>
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>4.0</em:minVersion>
- <em:maxVersion>53.0.0</em:maxVersion>
+ <em:maxVersion>56.0</em:maxVersion>
</Description>
</em:targetApplication>
<!-- SeaMonkey
2.0 is Gecko 1.9.1
2.1 is Gecko 2.0
2.2 is Gecko 5.0
2.x is Gecko (x+3).0, where x is greater than 2 -->
<em:targetApplication>
<Description>
<em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
<em:minVersion>2.1</em:minVersion>
- <em:maxVersion>2.50</em:maxVersion>
+ <em:maxVersion>2.54</em:maxVersion>
</Description>
</em:targetApplication>
<!-- Pale Moon -->
<em:targetApplication>
<Description>
<em:id>{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}</em:id>
<em:minVersion>25.0</em:minVersion>
- <em:maxVersion>25.*</em:maxVersion>
+ <em:maxVersion>27.*</em:maxVersion>
</Description>
</em:targetApplication>
<!-- Sunbird -->
<em:targetApplication>
<Description>
<em:id>{718e30fb-e89b-41dd-9da7-e25a45638b28}</em:id>
<em:minVersion>1.0b1pre</em:minVersion>
@@ -77,27 +78,27 @@
3.0 is Gecko 1.9.1
3.1 is Gecko 1.9.2
5.0 is Gecko 5.0
x.0 is Gecko x.0, where x is greater than 5 -->
<em:targetApplication>
<Description>
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
<em:minVersion>4.0</em:minVersion>
- <em:maxVersion>53.0</em:maxVersion>
+ <em:maxVersion>57.0</em:maxVersion>
</Description>
</em:targetApplication>
<!-- Gecko Toolkit
version 2.0.0 and higher -->
<em:targetApplication>
<Description>
<em:id>toolkit@mozilla.org</em:id>
<em:minVersion>2.0</em:minVersion>
- <em:maxVersion>53.0</em:maxVersion>
+ <em:maxVersion>57.0</em:maxVersion>
</Description>
</em:targetApplication>
<!-- front-end metadata -->
<em:name>DOM Inspector</em:name>
<em:description>Inspects the structure and properties of a window and its contents.</em:description>
<em:creator>mozilla.org</em:creator>
<em:homepageURL>http://www.mozilla.org/projects/inspector/</em:homepageURL>
--- a/resources/content/jsutil/system/PrefUtils.js
+++ b/resources/content/jsutil/system/PrefUtils.js
@@ -27,26 +27,26 @@ var PrefUtils =
var prefService = XPCU.getService("@mozilla.org/preferences-service;1", "nsIPrefService");
this.mPrefs = prefService.getBranch(null);
},
addObserver: function addObserver(aDomain, aFunction)
{
if (!this.mPrefs) this.init();
- var pbi = XPCU.QI(this.mPrefs, "nsIPrefBranch2");
+ var pbi = XPCU.QI(this.mPrefs, "nsIPrefBranch");
if (pbi)
pbi.addObserver(aDomain, aFunction, false);
},
removeObserver: function removeObserver(aDomain, aFunction)
{
if (!this.mPrefs) this.init();
- var pbi = XPCU.QI(this.mPrefs, "nsIPrefBranch2");
+ var pbi = XPCU.QI(this.mPrefs, "nsIPrefBranch");
if (pbi)
pbi.removeObserver(aDomain, aFunction);
},
setPref: function(aName, aValue)
{
if (!this.mPrefs) this.init();