754573 - remove Services.prefs.getBranch(null) occurrence in Toolkit browser.xml

Status: VERIFIED FIXED

(Toolkit :: General, defect)

Description

[:aceman]

+++ This bug was initially created as a clone of Bug #738568 comment 48 to comment 53 +++

459       <field name="mPrefs" readonly="true">
460         Components.classes['@mozilla.org/preferences-service;1']
461                   .getService(Components.interfaces.nsIPrefService)
462                   .getBranch(null);
463       </field>

Then just get rid of the ".getBranch(null)" part.

***

254       <property name="preferences"
255                 onget="return Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefService);"
256                 readonly="true"/>

I'm not sure why there are 2 nsIPrefService services in this file.
Maybe one could be removed or at least use the other one?

Philip Chee 2012-03-31 12:09:37 CEST

Both came from Hewitt's initial checkin for Bug 165955 - Check in Satchel (the successor to wallet). It's probably an accidental (manual) merge between Phoenix and the XPFE browser bindings. According to MXR the preferences property isn't used anywhere.

:Gavin Sharp (use [e-mail] for email) 2012-04-03 00:19:34 CEST

(In reply to Serge Gautherie (:sgautherie) from comment #51)
> 459       <field name="mPrefs" readonly="true">
> 460         Components.classes['@mozilla.org/preferences-service;1']
> 461                   .getService(Components.interfaces.nsIPrefService)
> 462                   .getBranch(null);
> 
> Then just get rid of the ".getBranch(null)" part.

You also need to change the nsIPrefService to nsIPrefBranch.

Comment 1

[:aceman]

Attachment: patch

Does what the comments recommend.

While there, I removed some trailing whitespace.

Comment 2

[:Gavin Sharp [email: [e-mail]]]

Comment on attachment 623422 [details] [diff] [review]
patch

>diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml

>-      <property name="preferences"

Removing this will likely break someone - just make it call the other property and keep it for compatibility.


>-            promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
>+            promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]

If you're going to touch this you might as well add the missing "var" :)

Comment 3

[:aceman]

Attachment: patch v2

Thanks.

Comment 4

[:Gavin Sharp [email: [e-mail]]]

Comment on attachment 624136 [details] [diff] [review]
patch v2

>diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml

>       <property name="preferences"
>-                onget="return Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefService);"
>+                onget="return this.mPrefs;"

mPrefs is an nsIPrefBranch, so to maintain compat you'll need this.mPrefs.QueryInterface(Components.interfaces.nsIPrefService).

r=me with that.

Comment 5

[:aceman]

Attachment: patch v3

OK, done.

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/4c2e4d6846bd

Comment 7

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/4c2e4d6846bd

Comment 8

[Serge Gautherie (:sgautherie)]

V.Fixed, per MXR search.