From f91bf49aae8bb5d3790b545f8f03325befc38c85 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 4 May 2022 05:48:14 -0400 Subject: [PATCH] =?UTF-8?q?fx-compat:=20`nsIIdleService`=20=E2=86=92=20`ns?= =?UTF-8?q?IUserIdleService`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chrome/content/zotero/xpcom/data/items.js | 4 ++-- chrome/content/zotero/xpcom/db.js | 4 ++-- chrome/content/zotero/xpcom/fulltext.js | 12 ++++++------ .../content/zotero/xpcom/sync/syncEventListeners.js | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/items.js b/chrome/content/zotero/xpcom/data/items.js index c07298798d..6b794ba4cf 100644 --- a/chrome/content/zotero/xpcom/data/items.js +++ b/chrome/content/zotero/xpcom/data/items.js @@ -1532,8 +1532,8 @@ Zotero.Items = function() { } }; - var idleService = Components.classes["@mozilla.org/widget/idleservice;1"]. - getService(Components.interfaces.nsIIdleService); + var idleService = Components.classes["@mozilla.org/widget/useridleservice;1"]. + getService(Components.interfaces.nsIUserIdleService); idleService.addIdleObserver(this._emptyTrashIdleObserver, 305); } diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js index 791d79b137..ac8ed7cb71 100644 --- a/chrome/content/zotero/xpcom/db.js +++ b/chrome/content/zotero/xpcom/db.js @@ -1234,8 +1234,8 @@ Zotero.DBConnection.prototype._getConnectionAsync = async function (options) { // Register idle observer for DB backup Zotero.Schema.schemaUpdatePromise.then(() => { Zotero.debug("Initializing DB backup idle observer"); - var idleService = Components.classes["@mozilla.org/widget/idleservice;1"] - .getService(Components.interfaces.nsIIdleService); + var idleService = Components.classes["@mozilla.org/widget/useridleservice;1"] + .getService(Components.interfaces.nsIUserIdleService); idleService.addIdleObserver(this, 300); }); } diff --git a/chrome/content/zotero/xpcom/fulltext.js b/chrome/content/zotero/xpcom/fulltext.js index 63f8a5df57..09c9b005ff 100644 --- a/chrome/content/zotero/xpcom/fulltext.js +++ b/chrome/content/zotero/xpcom/fulltext.js @@ -850,8 +850,8 @@ Zotero.Fulltext = Zotero.FullText = new function(){ if (!_idleObserverIsRegistered) { Zotero.debug("Starting full-text content processor"); - var idleService = Components.classes["@mozilla.org/widget/idleservice;1"] - .getService(Components.interfaces.nsIIdleService); + var idleService = Components.classes["@mozilla.org/widget/useridleservice;1"] + .getService(Components.interfaces.nsIUserIdleService); idleService.addIdleObserver(this.idleObserver, _idleObserverDelay); _idleObserverIsRegistered = true; } @@ -861,8 +861,8 @@ Zotero.Fulltext = Zotero.FullText = new function(){ this.unregisterContentProcessor = function () { if (_idleObserverIsRegistered) { Zotero.debug("Unregistering full-text content processor idle observer"); - var idleService = Components.classes["@mozilla.org/widget/idleservice;1"] - .getService(Components.interfaces.nsIIdleService); + var idleService = Components.classes["@mozilla.org/widget/useridleservice;1"] + .getService(Components.interfaces.nsIUserIdleService); idleService.removeIdleObserver(this.idleObserver, _idleObserverDelay); _idleObserverIsRegistered = false; } @@ -894,8 +894,8 @@ Zotero.Fulltext = Zotero.FullText = new function(){ this.processUnprocessedContent = Zotero.Promise.coroutine(function* (itemIDs) { // Idle observer can take a little while to trigger and may not cancel the setTimeout() // in time, so check idle time directly - var idleService = Components.classes["@mozilla.org/widget/idleservice;1"] - .getService(Components.interfaces.nsIIdleService); + var idleService = Components.classes["@mozilla.org/widget/useridleservice;1"] + .getService(Components.interfaces.nsIUserIdleService); if (idleService.idleTime < _idleObserverDelay * 1000) { return; } diff --git a/chrome/content/zotero/xpcom/sync/syncEventListeners.js b/chrome/content/zotero/xpcom/sync/syncEventListeners.js index 6e046141e2..36db2b4c6f 100644 --- a/chrome/content/zotero/xpcom/sync/syncEventListeners.js +++ b/chrome/content/zotero/xpcom/sync/syncEventListeners.js @@ -245,8 +245,8 @@ Zotero.Sync.EventListeners.IdleListener = { register: function () { Zotero.debug("Registering auto-sync idle observer"); - var idleService = Components.classes["@mozilla.org/widget/idleservice;1"] - .getService(Components.interfaces.nsIIdleService); + var idleService = Components.classes["@mozilla.org/widget/useridleservice;1"] + .getService(Components.interfaces.nsIUserIdleService); idleService.addIdleObserver(this, this._idleTimeout); idleService.addIdleObserver(this._backObserver, this._backTimeout); }, @@ -299,8 +299,8 @@ Zotero.Sync.EventListeners.IdleListener = { unregister: function () { Zotero.debug("Unregistering auto-sync idle observer"); - var idleService = Components.classes["@mozilla.org/widget/idleservice;1"] - .getService(Components.interfaces.nsIIdleService); + var idleService = Components.classes["@mozilla.org/widget/useridleservice;1"] + .getService(Components.interfaces.nsIUserIdleService); idleService.removeIdleObserver(this, this._idleTimeout); idleService.removeIdleObserver(this._backObserver, this._backTimeout); }