wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 791799 - Settings: Remove mozSettings.getLock. r=fabrice

Browse Source
This commit is contained in:
Gregor Wagner 2012-09-19 10:21:30 -07:00
parent 0b7cb0acca
commit f0304ba40a
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/interfaces/settings/nsIDOMSettingsManager.idl
View File

@ -20,11 +20,10 @@ interface nsIDOMSettingsLock : nsISupports
nsIDOMDOMRequest clear();
};
[scriptable, uuid(0694f5e0-f777-11e1-a21f-0800200c9a66)]
[scriptable, uuid(c40b1c70-00fb-11e2-a21f-0800200c9a66)]
interface nsIDOMSettingsManager : nsISupports
{
nsIDOMSettingsLock createLock();
nsIDOMSettingsLock getLock();
void addObserver(in DOMString name, in jsval callback);
void removeObserver(in DOMString name, in jsval callback);

7
dom/settings/SettingsManager.js
View File

@ -209,7 +209,7 @@ SettingsLock.prototype = {
};
const SETTINGSMANAGER_CONTRACTID = "@mozilla.org/settingsManager;1";
const SETTINGSMANAGER_CID = Components.ID("{0694f5e0-f777-11e1-a21f-0800200c9a66}");
const SETTINGSMANAGER_CID = Components.ID("{c40b1c70-00fb-11e2-a21f-0800200c9a66}");
const nsIDOMSettingsManager = Ci.nsIDOMSettingsManager;
let myGlobal = this;
@ -259,11 +259,6 @@ SettingsManager.prototype = {
return lock;
},
getLock: function() {
dump("WARNING: Use createLock instead of getLock!");
return this.createLock();
},
receiveMessage: function(aMessage) {
debug("Settings::receiveMessage: " + aMessage.name);
let msg = aMessage.json;

4
dom/settings/SettingsManager.manifest
View File

@ -1,5 +1,5 @@
component {0694f5e0-f777-11e1-a21f-0800200c9a66} SettingsManager.js
contract @mozilla.org/settingsManager;1 {0694f5e0-f777-11e1-a21f-0800200c9a66}
component {c40b1c70-00fb-11e2-a21f-0800200c9a66} SettingsManager.js
contract @mozilla.org/settingsManager;1 {c40b1c70-00fb-11e2-a21f-0800200c9a66}
category JavaScript-navigator-property mozSettings @mozilla.org/settingsManager;1
component {ef95ddd0-6308-11e1-b86c-0800200c9a66} SettingsManager.js