From 54a64863e227e815440b5180d2fced7f1ebe5fd1 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Fri, 13 Jan 2017 11:34:26 +0100
Subject: [PATCH] [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.
---
extensions/firefox/content/PdfJs.jsm | 10 +++++-----
extensions/firefox/content/PdfjsChromeUtils.jsm | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/extensions/firefox/content/PdfJs.jsm b/extensions/firefox/content/PdfJs.jsm
index b86cbbcda..0f8e676b9 100644
--- a/extensions/firefox/content/PdfJs.jsm
+++ b/extensions/firefox/content/PdfJs.jsm
@@ -181,11 +181,11 @@ var PdfJs = {
uninit: function uninit() {
if (this._initialized) {
- Services.prefs.removeObserver(PREF_DISABLED, this, false);
- Services.prefs.removeObserver(PREF_DISABLED_PLUGIN_TYPES, this, false);
- Services.obs.removeObserver(this, TOPIC_PDFJS_HANDLER_CHANGED, false);
- Services.obs.removeObserver(this, TOPIC_PLUGINS_LIST_UPDATED, false);
- Services.obs.removeObserver(this, TOPIC_PLUGIN_INFO_UPDATED, false);
+ Services.prefs.removeObserver(PREF_DISABLED, this);
+ Services.prefs.removeObserver(PREF_DISABLED_PLUGIN_TYPES, this);
+ Services.obs.removeObserver(this, TOPIC_PDFJS_HANDLER_CHANGED);
+ Services.obs.removeObserver(this, TOPIC_PLUGINS_LIST_UPDATED);
+ Services.obs.removeObserver(this, TOPIC_PLUGIN_INFO_UPDATED);
this._initialized = false;
}
this._ensureUnregistered();
diff --git a/extensions/firefox/content/PdfjsChromeUtils.jsm b/extensions/firefox/content/PdfjsChromeUtils.jsm
index 16bb0d9ca..fccbd88b3 100644
--- a/extensions/firefox/content/PdfjsChromeUtils.jsm
+++ b/extensions/firefox/content/PdfjsChromeUtils.jsm
@@ -94,7 +94,7 @@ var PdfjsChromeUtils = {
this._mmg.removeMessageListener('PDFJS:Parent:removeEventListener', 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._ppmm = null;