зеркало из https://github.com/mozilla/gecko-dev.git
Bug 885156 - Set _started in PushService.init(). r=dougt
This commit is contained in:
Родитель
e17c3ba51e
Коммит
a4d0a3c54e
|
@ -460,6 +460,8 @@ this.PushService = {
|
||||||
prefs.observe("serverURL", this);
|
prefs.observe("serverURL", this);
|
||||||
// Used to monitor if the user wishes to disable Push.
|
// Used to monitor if the user wishes to disable Push.
|
||||||
prefs.observe("connection.enabled", this);
|
prefs.observe("connection.enabled", this);
|
||||||
|
|
||||||
|
this._started = true;
|
||||||
},
|
},
|
||||||
|
|
||||||
_shutdownWS: function() {
|
_shutdownWS: function() {
|
||||||
|
|
|
@ -27,6 +27,7 @@ PushServiceLauncher.prototype = {
|
||||||
Services.obs.addObserver(this, "final-ui-startup", true);
|
Services.obs.addObserver(this, "final-ui-startup", true);
|
||||||
break;
|
break;
|
||||||
case "final-ui-startup":
|
case "final-ui-startup":
|
||||||
|
Services.obs.removeObserver(this, "final-ui-startup");
|
||||||
if (!Services.prefs.getBoolPref("services.push.enabled")) {
|
if (!Services.prefs.getBoolPref("services.push.enabled")) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче