Browse Source

[Bug 1330147] removeObserver calls should not supply a third parameter

*This is yet another very recent change that we were not notified about.*

Upstream changes from https://bugzilla.mozilla.org/show_bug.cgi?id=1330147, specifically https://hg.mozilla.org/mozilla-central/rev/8e0b7bc5fd71.
Jonas Jenwald 8 years ago
parent
commit
54a64863e2
  1. 10
      extensions/firefox/content/PdfJs.jsm
  2. 2
      extensions/firefox/content/PdfjsChromeUtils.jsm

10
extensions/firefox/content/PdfJs.jsm

@ -181,11 +181,11 @@ var PdfJs = {
uninit: function uninit() { uninit: function uninit() {
if (this._initialized) { if (this._initialized) {
Services.prefs.removeObserver(PREF_DISABLED, this, false); Services.prefs.removeObserver(PREF_DISABLED, this);
Services.prefs.removeObserver(PREF_DISABLED_PLUGIN_TYPES, this, false); Services.prefs.removeObserver(PREF_DISABLED_PLUGIN_TYPES, this);
Services.obs.removeObserver(this, TOPIC_PDFJS_HANDLER_CHANGED, false); Services.obs.removeObserver(this, TOPIC_PDFJS_HANDLER_CHANGED);
Services.obs.removeObserver(this, TOPIC_PLUGINS_LIST_UPDATED, false); Services.obs.removeObserver(this, TOPIC_PLUGINS_LIST_UPDATED);
Services.obs.removeObserver(this, TOPIC_PLUGIN_INFO_UPDATED, false); Services.obs.removeObserver(this, TOPIC_PLUGIN_INFO_UPDATED);
this._initialized = false; this._initialized = false;
} }
this._ensureUnregistered(); this._ensureUnregistered();

2
extensions/firefox/content/PdfjsChromeUtils.jsm

@ -94,7 +94,7 @@ var PdfjsChromeUtils = {
this._mmg.removeMessageListener('PDFJS:Parent:removeEventListener', this); this._mmg.removeMessageListener('PDFJS:Parent:removeEventListener', this);
this._mmg.removeMessageListener('PDFJS:Parent:updateControlState', this); this._mmg.removeMessageListener('PDFJS:Parent:updateControlState', this);
Services.obs.removeObserver(this, 'quit-application', false); Services.obs.removeObserver(this, 'quit-application');
this._mmg = null; this._mmg = null;
this._ppmm = null; this._ppmm = null;

Loading…
Cancel
Save